patch --as-needed instead of filtering it (bug #171391)

Package-Manager: portage-2.1.2.4

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index c720fa464a5d010b3bf4ae4a09fa5f7882cdb97b..97162c5ea0fde7a03d733fcdd8ac71b207e3df87 100644 (file)
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.48 2007/04/28 21:52:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.49 2007/04/30 16:04:17 mabi Exp $
+
+*ion3-20070318-r2 (30 Apr 2007)
+
+  30 Apr 2007; Matti Bickel <mabi@gentoo.org>
+  +files/20070318/208_all_as-needed.patch, -ion3-20070318-r1.ebuild,
+  +ion3-20070318-r2.ebuild:
+  patch --as-needed instead of filtering it (bug #171391)
 
 *ion3-20070318-r1 (28 Apr 2007)
 

diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index ffc4b6de3cb4bf7d587e7b59e63a4428b694d7ef..d3323d44765fe911f7f70cf87b0b2c628a9735eb 100644 (file)
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -49,6 +49,10 @@ AUX 20070318/207_all_bindings-manpage.patch 3159 RMD160 efcb802e1e00b85398facc94
 MD5 dbd4e494033db439cd0610ef880e2659 files/20070318/207_all_bindings-manpage.patch 3159
 RMD160 efcb802e1e00b85398facc945053fe793ed2d223 files/20070318/207_all_bindings-manpage.patch 3159
 SHA256 1e5d315510dde32a94b0e967cc1a315cd84cbb43f03b9a928ad80ee7a75945ba files/20070318/207_all_bindings-manpage.patch 3159
+AUX 20070318/208_all_as-needed.patch 350 RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 SHA1 2a59201ad480f35e7553c4bd470c696fc5dc0436 SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893
+MD5 477892385b4dd0708761fe54886459d7 files/20070318/208_all_as-needed.patch 350
+RMD160 d4a5d21442b8cdb618e116dd542389b2c6a0d442 files/20070318/208_all_as-needed.patch 350
+SHA256 0bedd444e6384f35f6b37c4ec2848150f25ae1d1b93fe5062934887786cba893 files/20070318/208_all_as-needed.patch 350
 AUX ion3-20060317-truetype.patch 19704 RMD160 6a11b4d81926224171618c036b5597948e23d89a SHA1 c387e111c65d098793ef59d020225d3770688a2a SHA256 a1934d7ea40f959579b4b4b20f08bcbc9f037beb7e50737f8110273f7f5f58d5
 MD5 f77e47b00b912f3b0b6bb35a53f158a1 files/ion3-20060317-truetype.patch 19704
 RMD160 6a11b4d81926224171618c036b5597948e23d89a files/ion3-20060317-truetype.patch 19704
@@ -87,18 +91,18 @@ EBUILD ion3-20061223.ebuild 4593 RMD160 3fa7a2c4ebcb83f82697331c16e85b251cba4691
 MD5 83163dc63430d299f40d3acbfbfe724b ion3-20061223.ebuild 4593
 RMD160 3fa7a2c4ebcb83f82697331c16e85b251cba4691 ion3-20061223.ebuild 4593
 SHA256 ec029208d92bc8aa0e83b68d1eab4890880e05885e6f72e18718b34b31274078 ion3-20061223.ebuild 4593
-EBUILD ion3-20070318-r1.ebuild 4407 RMD160 226cd1f4a6628af26bb2de026098e48fc03f8cfb SHA1 6aaa2f88031f9856d0664478085a94c5e1596651 SHA256 1d99860a3cb5da3dd7ac67c6d5a17de3759c3b546218f5f4ff8a14ae495a7490
-MD5 37c9e676404f7a6b7987b1ca059af836 ion3-20070318-r1.ebuild 4407
-RMD160 226cd1f4a6628af26bb2de026098e48fc03f8cfb ion3-20070318-r1.ebuild 4407
-SHA256 1d99860a3cb5da3dd7ac67c6d5a17de3759c3b546218f5f4ff8a14ae495a7490 ion3-20070318-r1.ebuild 4407
+EBUILD ion3-20070318-r2.ebuild 4371 RMD160 3fd8c5b901364b6e6f148bdb9c6b82d8125782a0 SHA1 e1210e9f695d225db71f16b0cd5c75ccf5019e5e SHA256 b2f06db4a9301527716d2373ffe7d2a0c30ce2aa3556be7f4a249cb4791f9e59
+MD5 9f6ead3bb2b5abcb1040d94a2e5995e2 ion3-20070318-r2.ebuild 4371
+RMD160 3fd8c5b901364b6e6f148bdb9c6b82d8125782a0 ion3-20070318-r2.ebuild 4371
+SHA256 b2f06db4a9301527716d2373ffe7d2a0c30ce2aa3556be7f4a249cb4791f9e59 ion3-20070318-r2.ebuild 4371
 EBUILD ion3-20070318.ebuild 4359 RMD160 4770f3d3e58bca2e2373ac4421b4721463227ebf SHA1 e04663e214090ae7b9be26f1bb32d44a3eb72534 SHA256 9bd53911c457fd2aca0d1790e0bca7c194cce680124f54d70eec69c43d3473fd
 MD5 af1afc207ecfc2b555ae71c9d995a4e9 ion3-20070318.ebuild 4359
 RMD160 4770f3d3e58bca2e2373ac4421b4721463227ebf ion3-20070318.ebuild 4359
 SHA256 9bd53911c457fd2aca0d1790e0bca7c194cce680124f54d70eec69c43d3473fd ion3-20070318.ebuild 4359
-MISC ChangeLog 7649 RMD160 6afa82ea84d60db2fee18e3d7e58386f6824f3c4 SHA1 7449e3feb2e1494243ab3a45500fa51d7945ab4c SHA256 9e3d580125cf875383189606dc08eed916d94813a1c5721e1181b188dbcacd45
-MD5 c33fc660e0402aa665fb5e11c60de30c ChangeLog 7649
-RMD160 6afa82ea84d60db2fee18e3d7e58386f6824f3c4 ChangeLog 7649
-SHA256 9e3d580125cf875383189606dc08eed916d94813a1c5721e1181b188dbcacd45 ChangeLog 7649
+MISC ChangeLog 7884 RMD160 e4329904b62fb0830d775fcce74e799c61c70af3 SHA1 ac0835da48b674340e2d4d712e8baea030dafcc5 SHA256 ce411b1dfbea143908f6ad280f6f7732c27806220c53c19a89617c8a327e79ef
+MD5 df0353d3ce4b2e3618cae895c19f35cf ChangeLog 7884
+RMD160 e4329904b62fb0830d775fcce74e799c61c70af3 ChangeLog 7884
+SHA256 ce411b1dfbea143908f6ad280f6f7732c27806220c53c19a89617c8a327e79ef ChangeLog 7884
 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
@@ -112,13 +116,13 @@ SHA256 0a8be4455d11e16b8f4c20d6b7019d73d7e564f1a9c41134b512fd982dc675c4 files/di
 MD5 1f454e2ba54eec9e1f3fa03e307b61f6 files/digest-ion3-20070318 1045
 RMD160 7087b16c049c3b8b4d150ab7eb8a461e67ae28e6 files/digest-ion3-20070318 1045
 SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/digest-ion3-20070318 1045
-MD5 1f454e2ba54eec9e1f3fa03e307b61f6 files/digest-ion3-20070318-r1 1045
-RMD160 7087b16c049c3b8b4d150ab7eb8a461e67ae28e6 files/digest-ion3-20070318-r1 1045
-SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/digest-ion3-20070318-r1 1045
+MD5 1f454e2ba54eec9e1f3fa03e307b61f6 files/digest-ion3-20070318-r2 1045
+RMD160 7087b16c049c3b8b4d150ab7eb8a461e67ae28e6 files/digest-ion3-20070318-r2 1045
+SHA256 b2181757e7912e1c67e67d7f3e4200e3cf9b8c4d2eea0ff964f2e92e6e3ea66d files/digest-ion3-20070318-r2 1045
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGM8NDfNMcoUhJ7GwRAjIzAKCn+Qedl6yqnQxI2ZjbmpwpaLYfZACdGaiG
-M4dA5AdqLcQesjlQYXSnIEA=
-=aEaa
+iD8DBQFGNhMffNMcoUhJ7GwRAuhmAJ0UeJPYhz5N1/u7jhOvqJ0pBCSIPACgmzjS
+Ce+ZT17dA9l11cMOakFXl7M=
+=Bhfp
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/ion3/files/20070318/208_all_as-needed.patch b/x11-wm/ion3/files/20070318/208_all_as-needed.patch
new file mode 100644 (file)
index 0000000..662a078
--- /dev/null
+++ b/x11-wm/ion3/files/20070318/208_all_as-needed.patch
@@ -0,0 +1,12 @@
+diff -uNr ion-3ds-20070318.orig/de/Makefile ion-3ds-20070318/de/Makefile
+--- ion-3ds-20070318.orig/de/Makefile  2007-03-18 21:31:37.000000000 +0100
++++ ion-3ds-20070318/de/Makefile       2007-04-30 17:30:23.000000000 +0200
+@@ -17,6 +17,8 @@
+ 
+ MAKE_EXPORTS=de
+ 
++LDFLAGS+=-lXext
++
+ ######################################
+ 
+ include $(TOPDIR)/build/rules.mk

diff --git a/x11-wm/ion3/files/digest-ion3-20070318-r1 b/x11-wm/ion3/files/digest-ion3-20070318-r2
similarity index 100%
rename from x11-wm/ion3/files/digest-ion3-20070318-r1
rename to x11-wm/ion3/files/digest-ion3-20070318-r2

diff --git a/x11-wm/ion3/ion3-20070318-r1.ebuild b/x11-wm/ion3/ion3-20070318-r2.ebuild
similarity index 96%
rename from x11-wm/ion3/ion3-20070318-r1.ebuild
rename to x11-wm/ion3/ion3-20070318-r2.ebuild
index 1605e04da4c3a22b82611bdbf5b773f4bafba407..ede686cc5141f7d5971530181bd84ba7765610ef 100644 (file)
--- a/x11-wm/ion3/ion3-20070318-r1.ebuild
+++ b/x11-wm/ion3/ion3-20070318-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070318-r1.ebuild,v 1.1 2007/04/28 21:52:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20070318-r2.ebuild,v 1.1 2007/04/30 16:04:17 mabi Exp $
 
 inherit eutils flag-o-matic
 
@@ -59,7 +59,6 @@ src_unpack() {
        EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" epatch
        use iontruetype && epatch ${FILESDIR}/xft-ion3-${PV}.patch
 
-
        # Rewrite install directories to be prefixed by DESTDIR for sake of portage's sandbox
        sed -i 's!\($(INSTALL\w*)\|rm -f\|ln -s\)\(.*\)\($(\w\+DIR)\)!\1\2$(DESTDIR)\3!g' Makefile */Makefile */*/Makefile build/rules.mk
 
@@ -97,8 +96,6 @@ src_unpack() {
 src_compile() {
        local myconf=""
 
-       filter-ldflags "-Wl,--as-needed"
-
        myconf="${myconf} `use_enable iontruetype xft`"
 
        # xfree