--- x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r2.ebuild	2010-01-06 21:07:27.000000000 +0100
+++ x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r2.ebuild	2010-03-22 13:42:57.091752509 +0100
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r2.ebuild,v 1.13 2010/01/06 19:37:58 fauli Exp $
 
+EAPI="2"
 inherit eutils toolchain-funcs
 
 MY_P=${P/_/}
@@ -16,27 +17,22 @@
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
-RDEPEND="=x11-libs/gtk+-2*"
+RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${MY_P}b.patch \
-		"${FILESDIR}"/${P}-gtk+-2.4_fix.patch
+src_prepare() {
+	epatch "${WORKDIR}"/${MY_P}b.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	mv switch.1 switch2.1 || die "mv failed"
 }
 
 src_compile() {
-	emake GCC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall $(pkg-config --cflags gtk+-2.0)" \
-		|| die "emake failed."
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
-	dobin switch2
-	newman switch.1 gtk-theme-switch2.1
-	dosym gtk-theme-switch2.1 /usr/share/man/man1/switch2.1
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die "install failed"
 }