Fix building with --as-needed & amd64 stable.

Package-Manager: portage-2.1.3.19

4 files changed, 81 insertions, 28 deletions

diff --git a/x11-misc/fluxter/ChangeLog b/x11-misc/fluxter/ChangeLog
index f1159a3b7f78..99f8d1f68f35 100644
--- a/x11-misc/fluxter/ChangeLog
+++ b/x11-misc/fluxter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fluxter
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxter/ChangeLog,v 1.13 2007/03/19 01:20:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxter/ChangeLog,v 1.14 2007/11/18 17:18:39 drac Exp $
+
+  18 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/fluxter-0.1.0-asneeded.patch, fluxter-0.1.0.ebuild:
+  Fix building with --as-needed & amd64 stable.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/x11-misc/fluxter/Manifest b/x11-misc/fluxter/Manifest
index 6e90515d533d..ea6c32cc02ab 100644
--- a/x11-misc/fluxter/Manifest
+++ b/x11-misc/fluxter/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fluxter-0.1.0-asneeded.patch 1463 RMD160 6f34d3229161727ceb2df35708291f923544ec8c SHA1 b8caeb5172a36975cdc2179ddf4ecb684eb1b194 SHA256 6d3a1e5eec7cecaf4308b69e4b9b2ce5a6ac3f5457d95d95c2ff5c087d0c2ce2
+MD5 1cdd955b926450686b17ce552bedfe1b files/fluxter-0.1.0-asneeded.patch 1463
+RMD160 6f34d3229161727ceb2df35708291f923544ec8c files/fluxter-0.1.0-asneeded.patch 1463
+SHA256 6d3a1e5eec7cecaf4308b69e4b9b2ce5a6ac3f5457d95d95c2ff5c087d0c2ce2 files/fluxter-0.1.0-asneeded.patch 1463
 DIST fluxter-0.1.0.tar.gz 99522 RMD160 b4059b81aa448f6f5c3ef7f4672335396448ac2d SHA1 d0da4759a21fdadc8a6457195c87b6648b5d69bc SHA256 e2dc2c18e0a5299feac44facfc4748e92453e916b7b991fe79d00ae9c460e137
-EBUILD fluxter-0.1.0.ebuild 730 RMD160 d3cb175ceffdf45aa3d1ea8acec2a9772f3ab30c SHA1 74b6f2e9994d8d45e5a997ce44b451be43a4309a SHA256 f9a28ccc8c57fd1a149a98f49bf002aadaf2e81638d2bb8693d1a31db85117b2
-MD5 ac7818e27561289f76409ea090cb7e73 fluxter-0.1.0.ebuild 730
-RMD160 d3cb175ceffdf45aa3d1ea8acec2a9772f3ab30c fluxter-0.1.0.ebuild 730
-SHA256 f9a28ccc8c57fd1a149a98f49bf002aadaf2e81638d2bb8693d1a31db85117b2 fluxter-0.1.0.ebuild 730
-MISC ChangeLog 1456 RMD160 8a22d422bedfd2dc625192846884c9cfecf3c853 SHA1 87776b558d0e768a75fc32d6be4796f9209efa8c SHA256 b3881261857c7a973200fe6c814933475bd060e396d74f2a879488fe3cd56273
-MD5 2da9688a6dffa920a50ef7476eab8ff2 ChangeLog 1456
-RMD160 8a22d422bedfd2dc625192846884c9cfecf3c853 ChangeLog 1456
-SHA256 b3881261857c7a973200fe6c814933475bd060e396d74f2a879488fe3cd56273 ChangeLog 1456
+EBUILD fluxter-0.1.0.ebuild 875 RMD160 27fb1816b5616dceeecc8446fbd563c2e8ba7cbb SHA1 478117b7d8b3e7d30881bd675463181cf312c9ea SHA256 d8857f3cc5321d14871a29e3afb1d6f8801eadef79386ad9c5daa2f3eb10a545
+MD5 c2c0576b149df70bfbdf2de8a0973603 fluxter-0.1.0.ebuild 875
+RMD160 27fb1816b5616dceeecc8446fbd563c2e8ba7cbb fluxter-0.1.0.ebuild 875
+SHA256 d8857f3cc5321d14871a29e3afb1d6f8801eadef79386ad9c5daa2f3eb10a545 fluxter-0.1.0.ebuild 875
+MISC ChangeLog 1613 RMD160 b85e1271f59025e72a1d8163e99768e0991c4b3f SHA1 645a7bc186d59eda7afab9490b36919e771e325d SHA256 1ca81b0b967d8eefa4d198cc6ff8b79a04d127ed60f86ef408c5dbece7f7eac1
+MD5 cf21e57ad9aaeaa50b628f1fa1cbc132 ChangeLog 1613
+RMD160 b85e1271f59025e72a1d8163e99768e0991c4b3f ChangeLog 1613
+SHA256 1ca81b0b967d8eefa4d198cc6ff8b79a04d127ed60f86ef408c5dbece7f7eac1 ChangeLog 1613
 MISC metadata.xml 163 RMD160 f3a3f66a62012d6c9635ae33abfe28f549471c0a SHA1 923ee2f9b457e2110de082bbe17302c70c81a1f2 SHA256 058ba1219e0871827744b5cde326ae73cc7d326079e21e492b84333190ff1b6a
 MD5 579076f73457df8c5cba170b0e99634d metadata.xml 163
 RMD160 f3a3f66a62012d6c9635ae33abfe28f549471c0a metadata.xml 163
@@ -17,10 +18,3 @@ SHA256 058ba1219e0871827744b5cde326ae73cc7d326079e21e492b84333190ff1b6a metadata
 MD5 c1213c36bbf1bf38e5363836f551327e files/digest-fluxter-0.1.0 238
 RMD160 06d004210ee16532759c4a600b0a6aad30d7eeec files/digest-fluxter-0.1.0 238
 SHA256 27b887ecc75ae4a1ea082a0af988330b4da922fa079c29e3ebd2094a26df46de files/digest-fluxter-0.1.0 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/eUxugEuf3OQ0akRAik3AJsEr9yD6C7NfZvxb74sHmKZGYWrgwCfaqHj
-ieI6dN+MAWGlgxeKMO8KFgs=
-=9c4u
------END PGP SIGNATURE-----
diff --git a/x11-misc/fluxter/files/fluxter-0.1.0-asneeded.patch b/x11-misc/fluxter/files/fluxter-0.1.0-asneeded.patch
new file mode 100644
index 000000000000..3551ba307ac6
--- /dev/null
+++ b/x11-misc/fluxter/files/fluxter-0.1.0-asneeded.patch
@@ -0,0 +1,45 @@
+diff -ur fluxter-0.1.0.orig/Makefile.am fluxter-0.1.0/Makefile.am
+--- fluxter-0.1.0.orig/Makefile.am	2002-04-14 08:50:33.000000000 +0300
++++ fluxter-0.1.0/Makefile.am	2007-11-18 19:11:50.000000000 +0200
+@@ -17,4 +17,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-fluxter_LDADD = @X_LIBS@
++fluxter_LDADD = @LIBS@
+diff -ur fluxter-0.1.0.orig/configure.in fluxter-0.1.0/configure.in
+--- fluxter-0.1.0.orig/configure.in	2002-04-14 01:03:05.000000000 +0300
++++ fluxter-0.1.0/configure.in	2007-11-18 19:11:35.000000000 +0200
+@@ -18,14 +18,12 @@
+ [
+  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CFLAGS" = "" && CFLAGS="-Wall"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -71,12 +69,12 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0.ebuild
index ab06769994cf..4152e6d018ac 100644
--- a/x11-misc/fluxter/fluxter-0.1.0.ebuild
+++ b/x11-misc/fluxter/fluxter-0.1.0.ebuild
@@ -1,23 +1,33 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxter/fluxter-0.1.0.ebuild,v 1.13 2006/12/07 02:19:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxter/fluxter-0.1.0.ebuild,v 1.14 2007/11/18 17:18:39 drac Exp $
+
+inherit autotools eutils
 
 DESCRIPTION="workspace pager dockapp, particularly useful with the Fluxbox window manager"
-HOMEPAGE="http://www.isomedia.com/homes/stevencooper/"
+HOMEPAGE="http://www.isomedia.com/homes/stevencooper"
 SRC_URI="http://www.isomedia.com/homes/stevencooper/files/${P}.tar.gz"
-IUSE=""
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
+IUSE=""
 
 DEPEND="virtual/blackbox"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
 src_compile() {
-	econf --datadir=/usr/share/commonbox || die
-	emake || die
+	econf --datadir=/usr/share/commonbox
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README COPYING AUTHORS ChangeLog NEWS README TODO
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README AUTHORS ChangeLog NEWS README TODO
 }