Don't use LDFLAGS to pass libraries. Use CC variable instead of hardcoded gcc. Missing USE depend wrt #248579 by Kacper Kowalik.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 64 insertions, 33 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/Manifest b/x11-misc/skippy/Manifest
index e758c9145834..aeff30131de6 100644
--- a/x11-misc/skippy/Manifest
+++ b/x11-misc/skippy/Manifest
@@ -1,5 +1,6 @@
-AUX skippy-pointer-size.patch 351 RMD160 5321b687daaa5b11a2438c5ba4160dc43b4bb6f1 SHA1 69cff61d2a169c3facd58d615351dcb95dccd902 SHA256 c06256dd2d94ef80944f7f541041088199bab2cdeb7418156f7a000ae1bc3bfb
+AUX skippy-0.5.0-Makefile.patch 968 RMD160 106d807449435f4c6aa19206ee89a50cad772188 SHA1 5266c869f8074e328c75825f59b92d467afc2898 SHA256 7e587b6bff65f95fddb691d34c487e0f490cb77b8da39e8887e412c4553e0baf
+AUX skippy-pointer-size.patch 204 RMD160 2707e51525c67a995a099f8cdb8d42f3b3cc4b34 SHA1 f51687195d708b28c0c895979f9978bca83ddc0c SHA256 59bbf3a68e45f6c79adadb40adb0840cdec8abb403967d4bf9ddb47189f36947
 DIST skippy-0.5.0.tar.bz2 23722 RMD160 66c8980881defaa3d634d6fe4f2745c91a2247e5 SHA1 30774b56fe2c355449843f4b16c1aa783f32daa7 SHA256 8f0f15f34a9fcfacb36cc8dc156d0d10c62020bbdd45edc348af67d861b74a99
-EBUILD skippy-0.5.0.ebuild 1187 RMD160 938c00f91297891e9f07d48c11baacd9b7b5efb1 SHA1 52ed60e4ef9029281c9a962d911bc5b6327b0aea SHA256 758b30433d6479d83f4ef29da6cdf40171768b8e3715a8851247075acc6b1016
-MISC ChangeLog 1643 RMD160 2f1bd4327abab60a924672ac642510566a40f675 SHA1 69cde8f72c72488062d514a6f8a518de74e12950 SHA256 7977ab8c31076eccdeb018d2a7baf2145c9026192b870976fffaeabaf589884b
+EBUILD skippy-0.5.0.ebuild 1181 RMD160 02e10c342fa5cff1c17b314a3185339aa8d0be67 SHA1 699be911af05ddf6eabfd3baf7ccc4cf5372e5ae SHA256 ef0b111041ecdac566e9bbf094e3979c2b02954cb69d8d65662f59acca896bed
+MISC ChangeLog 1895 RMD160 9135fd124d4787ebe82c4dc954b5c4dac42803af SHA1 393cfcb65e5ed716d80a0046b598975bafe65502 SHA256 0bc4577abd5b7a049d7bde2f602ef90738f7197e5588e6e97d4a370d9305165a
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
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
 }