4 files changed, 60 insertions, 30 deletions
diff --git a/x11-misc/skippy/ChangeLog b/x11-misc/skippy/ChangeLog
index a40a1fb645df..d4ed4eb7eaaf 100644
--- a/x11-misc/skippy/ChangeLog
+++ b/x11-misc/skippy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/skippy
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/skippy/ChangeLog,v 1.14 2009/01/09 14:24:15 remi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/skippy/ChangeLog,v 1.15 2010/02/06 20:52:14 ssuominen Exp $
+
+  06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> skippy-0.5.0.ebuild,
+  +files/skippy-0.5.0-Makefile.patch:
+  Don't use LDFLAGS to pass libraries. Use CC variable instead of hardcoded
+  gcc. Missing USE depend wrt #248579 by Kacper Kowalik.
 
   09 Jan 2009; Rémi Cardona <remi@gentoo.org> skippy-0.5.0.ebuild:
   Change virtual/xft dependency to x11-libs/libXft, bug 253771.
diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
new file mode 100644
index 000000000000..957d3ba6216c
--- /dev/null
+++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
@@ -0,0 +1,32 @@
+Don't use LDFLAGS to pass libraries.
+
+--- Makefile
++++ Makefile
+@@ -1,14 +1,12 @@
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = ${PREFIX}/bin
+ 
+-X11PREFIX = /usr/X11R6
+-
+-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall
+-LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
++CFLAGS += `imlib2-config --cflags` `pkg-config xft --cflags` -pedantic -Wall
++LDLIBS = -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
+ 
+ # Comment these out to disable Xinerama support
+ CFLAGS += -DXINERAMA
+-LDFLAGS += -lXext -lXinerama
++LDLIBS += -lXext -lXinerama
+ 
+ # Uncomment this for Xinerama debugging
+ #CFLAGS += -DDEBUG
+@@ -21,7 +19,7 @@
+ all: skippy${EXESUFFIX}
+ 
+ skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
+-	gcc ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
++	${CC} ${LDFLAGS} ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDLIBS}
+ 
+ clean:
+ 	rm -f skippy${EXESUFFIX}
diff --git a/x11-misc/skippy/files/skippy-pointer-size.patch b/x11-misc/skippy/files/skippy-pointer-size.patch
index deaa4f181c02..8a7ee42d177b 100644
--- a/x11-misc/skippy/files/skippy-pointer-size.patch
+++ b/x11-misc/skippy/files/skippy-pointer-size.patch
@@ -1,6 +1,5 @@
-diff -ur skippy-0.5.0/wm.c skippy-0.5.0.n/wm.c
---- skippy-0.5.0/wm.c	2005-07-20 01:27:23.000000000 +0200
-+++ skippy-0.5.0.n/wm.c	2005-07-20 01:28:48.000000000 +0200
+--- wm.c
++++ wm.c
 @@ -258,7 +258,7 @@
  		return 0;
  	
diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0.ebuild
index 9c2074352c5a..49dec1025887 100644
--- a/x11-misc/skippy/skippy-0.5.0.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/skippy/skippy-0.5.0.ebuild,v 1.13 2009/01/09 14:24:15 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/skippy/skippy-0.5.0.ebuild,v 1.14 2010/02/06 20:52:14 ssuominen Exp $
 
-inherit eutils
-
-IUSE=""
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality with various WMs"
 HOMEPAGE="http://thegraveyard.org/skippy.php"
@@ -13,43 +12,38 @@ SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
+IUSE=""
 
-RDEPEND="x11-libs/libXext
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXinerama
 	x11-libs/libXmu
 	x11-libs/libXft"
-
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xineramaproto
-	dev-util/pkgconfig
-	>=media-libs/imlib2-1.1.0"
+	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-pointer-size.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-pointer-size.patch \
+		"${FILESDIR}"/${P}-Makefile.patch
 }
 
 src_compile() {
-	emake || die "emake failed"
+	tc-export CC
+	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} BINDIR=/usr/bin install || die
-
-	insinto /usr/share/${P}
-	doins skippyrc-default
-
-	dodoc CHANGELOG
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGELOG skippyrc-default
 }
 
 pkg_postinst() {
-	einfo
-	einfo "You should copy /usr/share/${P}/skippyrc-default to ~/.skippyrc"
-	einfo "and edit the keysym used to invoke skippy"
-	einfo "(Find out the keysym name using 'xev')"
-	einfo
+	echo
+	elog "You should copy skippyrc-default from /usr/share/doc/${PF} to"
+	elog "~/.skippyrc and edit the keysym used to invoke skippy."
+	elog "Use x11-apps/xev to find out the keysym."
 	echo
 }