Remove --as-needed filtering, add a patch for it in 0.11.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

5 files changed, 75 insertions, 15 deletions

diff --git a/app-office/taxbird/ChangeLog b/app-office/taxbird/ChangeLog
index 447fc79d15a4..b979b63d6b4c 100644
--- a/app-office/taxbird/ChangeLog
+++ b/app-office/taxbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/taxbird
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/ChangeLog,v 1.14 2008/01/23 21:20:22 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/ChangeLog,v 1.15 2008/11/14 16:01:15 flameeyes Exp $
+
+  14 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/taxbird-0.11-asneeded.patch, taxbird-0.10.ebuild,
+  taxbird-0.11.ebuild:
+  Remove --as-needed filtering, add a patch for it in 0.11.
 
 *taxbird-0.11 (23 Jan 2008)
 
diff --git a/app-office/taxbird/Manifest b/app-office/taxbird/Manifest
index 0730506da9b6..32e0932bc456 100644
--- a/app-office/taxbird/Manifest
+++ b/app-office/taxbird/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX taxbird-0.11-asneeded.patch 1176 RMD160 a8cda54e8c7ffb76969b60c8b993f739551b1de4 SHA1 930c7761c481f5d4b690344e00ccc71bc265f70e SHA256 60a399ab07b93fc31ba7f737bad27f7ff9346e5398188bc30086daf817d29094
 DIST taxbird-0.10.tar.gz 249874 RMD160 adccf174046b63a59467129f24942df96af1ea19 SHA1 56678f0b506540b2ef0c551592444d50b5f80858 SHA256 2178b3dc3174b743d6c76970709045dcef462973af5b6244d4a471e1e99b73fe
 DIST taxbird-0.11.tar.gz 441592 RMD160 dc5316ab57ea1b22824a00396c81a87f3f08bf28 SHA1 5c2d7fd3871235bdb0adf8da4009d6f6ae666858 SHA256 0689613bf07db11c73ca125dda5e5a4a8f1973d7c0be6af0214afebd287021d6
-EBUILD taxbird-0.10.ebuild 1472 RMD160 265a82dc456784580b3443521f5fa5443a1b8409 SHA1 6f8e801e9edb9d0a1ab0f90c63ca8a8d6338196b SHA256 c27124a0eb64b0791503368ca9cc79eccb1b86b901066c6c9188fc1e8116f04b
-EBUILD taxbird-0.11.ebuild 1475 RMD160 963ba8b1c1b245f0c100b6c58016baabe7984914 SHA1 1e12e588eb0b263ff9dfa24702ef39c192ea6dc3 SHA256 de2491608486e155d1b3396e895528aea9c5e5c20bff85ec3dda397db8f4553a
-MISC ChangeLog 1796 RMD160 34543c9a88deda73b1e6086c7acdf94b41a65e2c SHA1 3e2827e5b4b68ea92861de0c6befba613ad5ffb9 SHA256 7cc630e48c71594d9b7ab9c7256f8f5d5e7bd013bbe83ec26d5ba0b2bfa7e49f
+EBUILD taxbird-0.10.ebuild 1431 RMD160 e10837fbe1260714a55f0cb1c2a0d58bedecf946 SHA1 9eb38865d50a72fbe191701352da8cb9b55a0001 SHA256 5fdc47dcee8973e3ec46d75696add0563ff359a611447ef0002cad85772bf7c5
+EBUILD taxbird-0.11.ebuild 1447 RMD160 422249efa9729ecd98d3bcf52c196c192bc02704 SHA1 8ad40a9f1450ac00c5771de62927c8905999f112 SHA256 9d1148562d47d69bd99da5ab6bb1589b2ba6ed674cc85c4837f648a96c8602b5
+MISC ChangeLog 1998 RMD160 3d47ef823de8dd505362953b33f5d4cd1db9aa95 SHA1 2d58457bffbe49bc40e88d5011b52e80dcb477f9 SHA256 cb1ef9e35686d2f630beda3414d596d7d3661ed92416671670f0bcdb368293ec
 MISC metadata.xml 251 RMD160 df09f36bb4d3177fcaabb5ff023a13abcb149133 SHA1 f51074ec5d852f680e7a65f36824b53f27a6aea9 SHA256 0a85c558984a637e5466304392dc868dbf156c1a1640d35d3906c6cc994b8eee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkdoM4ACgkQAiZjviIA2XiisgCgjwWltbQeWPrHxs98tRoM3LM0
+vvUAoKP7mR0ri3FbmmtkOwoQWIIWJfIC
+=8pM6
+-----END PGP SIGNATURE-----
diff --git a/app-office/taxbird/files/taxbird-0.11-asneeded.patch b/app-office/taxbird/files/taxbird-0.11-asneeded.patch
new file mode 100644
index 000000000000..361aeb06980b
--- /dev/null
+++ b/app-office/taxbird/files/taxbird-0.11-asneeded.patch
@@ -0,0 +1,44 @@
+Index: taxbird-0.11/configure.in
+===================================================================
+--- taxbird-0.11.orig/configure.in
++++ taxbird-0.11/configure.in
+@@ -32,7 +32,7 @@ AC_SUBST(GNOME_CFLAGS)
+ AC_SUBST(GNOME_LIBS)
+ 
+ backup_CFLAGS="$CFLAGS"
+-backup_LDFLAGS="$LDFLAGS"
++backup_LIBS="$LIBS"
+ 
+ #
+ # temporarily add libgeier to CFLAGS/LDFLAGS
+@@ -40,10 +40,10 @@ backup_LDFLAGS="$LDFLAGS"
+ #
+ PKG_CHECK_MODULES(GEIER, [libgeier >= 0.7])
+ AC_SUBST(GEIER_CFLAGS)
+-AC_SUBST(GEIER_LDFLAGS)
++AC_SUBST(GEIER_LIBS)
+ 
+ CFLAGS="$CFLAGS $GEIER_CFLAGS"
+-LDFLAGS="$LDFLAGS $GEIER_LIBS"
++LIBS="$LIBS $GEIER_LIBS"
+ 
+ dnl Check for new-style signature functions of libgeier
+ AC_CHECK_FUNCS([geier_dsig_sign_softpse])
+@@ -56,7 +56,7 @@ GUILE_FLAGS
+ GUILE_MODULE_REQUIRED(ice-9 format)
+ 
+ CFLAGS="$backup_CFLAGS $GUILE_CFLAGS"
+-LDFLAGS="$backup_LDFLAGS $GUILE_LDFLAGS"
++LIBS="$backup_LIBS $GUILE_LDFLAGS"
+ 
+ dnl Check for certain guile functions, introduced with libguile 1.8
+ AC_CHECK_FUNCS(scm_to_locale_string)
+@@ -67,7 +67,7 @@ AC_CHECK_FUNCS(scm_is_string)
+ # restore old CFLAGS/LDFLAGS again
+ #
+ CFLAGS="$backup_CFLAGS"
+-LDFLAGS="$backup_LDFLAGS"
++LIBS="$backup_LIBS"
+ 
+ 
+ #
diff --git a/app-office/taxbird/taxbird-0.10.ebuild b/app-office/taxbird/taxbird-0.10.ebuild
index fab3bb1dd5c3..a0dabda52ccc 100644
--- a/app-office/taxbird/taxbird-0.10.ebuild
+++ b/app-office/taxbird/taxbird-0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/taxbird-0.10.ebuild,v 1.4 2007/09/08 20:06:41 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/taxbird-0.10.ebuild,v 1.5 2008/11/14 16:01:15 flameeyes Exp $
 
 inherit eutils fdo-mime flag-o-matic
 
@@ -26,8 +26,6 @@ pkg_setup() {
 		eerror "This package requires dev-scheme/guile with USE=\"discouraged deprecated regex\"."
 		die "Please reemerge dev-scheme/guile with USE=\"discouraged deprecated regex\"."
 	fi
-
-	filter-ldflags -Wl,--as-needed --as-needed
 }
 
 src_compile() {
diff --git a/app-office/taxbird/taxbird-0.11.ebuild b/app-office/taxbird/taxbird-0.11.ebuild
index 3c0a03828367..933205edb431 100644
--- a/app-office/taxbird/taxbird-0.11.ebuild
+++ b/app-office/taxbird/taxbird-0.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/taxbird-0.11.ebuild,v 1.1 2008/01/23 21:20:22 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/taxbird-0.11.ebuild,v 1.2 2008/11/14 16:01:15 flameeyes Exp $
 
-inherit eutils fdo-mime flag-o-matic
+inherit eutils fdo-mime autotools
 
 DESCRIPTION="Taxbird provides a GUI to submit tax forms to the german digital tax project ELSTER."
 HOMEPAGE="http://www.taxbird.de/"
@@ -26,13 +26,15 @@ pkg_setup() {
 		eerror "This package requires dev-scheme/guile with USE=\"discouraged deprecated regex\"."
 		die "Please reemerge dev-scheme/guile with USE=\"discouraged deprecated regex\"."
 	fi
-
-	filter-ldflags -Wl,--as-needed --as-needed
 }
 
-src_compile() {
-	econf || die "Configure failed!"
-	emake || die "Make failed!"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	eautoreconf
 }
 
 src_install() {