Drop all FLAGS from upstream, correct soname symlink, #397859 & #397861

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog
index 40dfdd89238879dc1ef72293c86ed52ae6e1c81a..0ef0cb05c3d96fad56f26b50602fb9fcff230320 100644 (file)
--- a/dev-tcltk/tdom/ChangeLog
+++ b/dev-tcltk/tdom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tdom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.12 2012/01/02 22:13:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.13 2012/01/06 12:19:24 jlec Exp $
+
+*tdom-0.8.3-r1 (06 Jan 2012)
+
+  06 Jan 2012; Justin Lecher <jlec@gentoo.org> -tdom-0.8.3.ebuild,
+  +tdom-0.8.3-r1.ebuild, +files/tdom-0.8.3-soname.patch:
+  Drop all FLAGS from upstream, correct soname symlink, #397859 & #397861
 
   02 Jan 2012; Justin Lecher <jlec@gentoo.org> tdom-0.8.3.ebuild, metadata.xml:
   Moved to EAPI=4, handle static-libs correctly

diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 8daf2b0ea5a2db20e4cbbd98660df376755248a6..6a55aabbaebe26613558e222599e036939b43a74 100644 (file)
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -6,16 +6,17 @@ AUX tdom-0.8.2-soname.patch 962 RMD160 5e012113e1b28fe26e6987ffd703f9938032feec
 AUX tdom-0.8.2-tnc.patch 2806 RMD160 cd6515b716c0d4c5718c65faa69d927a9c3607eb SHA1 1a6e0c7ce2e435bc5cc50845c12bfc645f7b17ad SHA256 f220162108eaf974a5f06b59de0ec130dc0703014cd9f7d7570dec2186b6a50f
 AUX tdom-0.8.2.patch 2036 RMD160 7455431038e43cd57ceaad1c9595c68cf334ccd4 SHA1 8209a5d653531c2947ab22bf8ee396c3e080fb59 SHA256 523967222cf5d72fe84924b40f371831a10875599df9dd8d0c80ab2f5aa78472
 AUX tdom-0.8.3-expat.patch 2512 RMD160 7a763f6ee7683f3298425f1e42bac6432551af2f SHA1 391611bff0ec845ba75940dbecc29c76e91f3b35 SHA256 875a7d35aa920d971733d5319f713b4c3dbe0928e7e373bcddd9573d4249589c
+AUX tdom-0.8.3-soname.patch 963 RMD160 410b3043e85a9b4c920820e6a5619b098ed491d7 SHA1 cceda0c22d519febea2a2b26a8ee6877b460a431 SHA256 69126d56273b87599baf3aa58c7d016f4d32ffdced42fc9599c6abba94d3fa10
 DIST tDOM-0.8.2.tgz 969804 RMD160 a0ca4c2e45b97c5a7bdfeee20165a537b7fe6d8b SHA1 c4ee4e013b084f8af57f35a2a06eb0a428508978 SHA256 561e482b95906b5a64b69cbc7c13d01b7a34a95144744796fbc1219042cd5843
 DIST tDOM-0.8.3.tgz 990367 RMD160 df52d8b7c3ac9134dae20a3bcaa21e0e512e3289 SHA1 1b7db0357ffb96c0a6c879c385168491380a8ca5 SHA256 496d5950907dd70db61bc20c55a05a5521363ce3c076e2fdd97270181bc720b9
 EBUILD tdom-0.8.2.ebuild 1586 RMD160 e4d865ab7020bb937779a34cdcaef789ef9989c1 SHA1 5e166e71874e610c08bafc5127e151b5587232af SHA256 ae8e3365747292f82d7b160bdc8a6e685e8ab3ce5528424064a09ad01f8d87e2
-EBUILD tdom-0.8.3.ebuild 1664 RMD160 1328ff08269f80e03a2e705b18f04428631933a7 SHA1 65bc9eb451c81dd65abeaf71f26e999352c60b28 SHA256 1ca92b4e0a4a8e0c35138d978c0d5885c0c1b4fb990e22be304c7137229b4cb0
-MISC ChangeLog 1891 RMD160 7c5629003869f21f35e49681045e9d9e67df566d SHA1 a42cea3a0ee35a25c6aff9b2a42f07ccf442f591 SHA256 5ae704689bf114c79c84916bc0cdacafc532920218781009b98b544b5c30e033
+EBUILD tdom-0.8.3-r1.ebuild 1798 RMD160 322561e64073a04692acde27665ea1fe23e1df83 SHA1 72bf83104c66e0ae053522a95d8aa4d7fb30111e SHA256 a0bfbcb594b094e5dcd5ba15c0db8a79fdecad6ed3b53c212acf3e34519fef07
+MISC ChangeLog 2120 RMD160 917e7eb4fddad85792fd8ea18c89269bfdcf2b3b SHA1 f89dcb999fc9106114f45854a500845161a8ea82 SHA256 a1369ab943628ede14ea9dfde989a880a088a352b1c72fa2b4dce855c156774b
 MISC metadata.xml 508 RMD160 0ecbf5cb2a5c42fa36fa795b234c2282ed753f78 SHA1 05a533e8fe3073773179c717681ab601b53fffed SHA256 d9c09894f04bc0f13128c29fa668e7320db8e8c2e41b4fc06ac0a1845273a292
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8CLA0ACgkQgAnW8HDreRY9+gCdFzoDwY6Zus8bjEiXnpFnqQWq
-zZgAn01NniIgnVuPrZtvUak9X5RDM1vO
-=ab0u
+iEYEAREKAAYFAk8G5tEACgkQgAnW8HDreRagBwCdGEdPsa4AB4J1fnEkIZLWkeBk
+fFcAn3VQxeKgxRgfR162GqSet+oqi27m
+=/oNx
 -----END PGP SIGNATURE-----

diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
new file mode 100644 (file)
index 0000000..f742f6e
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.in b/Makefile.in
+index d995328..5c17e11 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -108,7 +108,7 @@ CFLAGS_DEFAULT     = @CFLAGS_DEFAULT@
+ CFLAGS_WARNING        = @CFLAGS_WARNING@
+ CLEANFILES    = @CLEANFILES@
+ EXEEXT                = @EXEEXT@
+-LDFLAGS_DEFAULT       = @LDFLAGS_DEFAULT@
++LDFLAGS_DEFAULT       = @LDFLAGS_DEFAULT@ -Wl,-soname,libtdom$(PACKAGE_VERSION).so
+ MAKE_LIB      = @MAKE_LIB@
+ MAKE_SHARED_LIB       = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB       = @MAKE_STATIC_LIB@
+diff --git a/extensions/tnc/Makefile.in b/extensions/tnc/Makefile.in
+index f8a332c..01e0ef0 100644
+--- a/extensions/tnc/Makefile.in
++++ b/extensions/tnc/Makefile.in
+@@ -98,7 +98,7 @@ CFLAGS_DEFAULT       = @CFLAGS_DEFAULT@
+ CFLAGS_WARNING        = @CFLAGS_WARNING@
+ CLEANFILES    = @CLEANFILES@
+ EXEEXT                = @EXEEXT@
+-LDFLAGS_DEFAULT       = @LDFLAGS_DEFAULT@
++LDFLAGS_DEFAULT       = @LDFLAGS_DEFAULT@ -Wl,-soname,libtnc$(PACKAGE_VERSION).so
+ MAKE_LIB      = @MAKE_LIB@
+ MAKE_SHARED_LIB       = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB       = @MAKE_STATIC_LIB@

diff --git a/dev-tcltk/tdom/tdom-0.8.3.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r1.ebuild
similarity index 84%
rename from dev-tcltk/tdom/tdom-0.8.3.ebuild
rename to dev-tcltk/tdom/tdom-0.8.3-r1.ebuild
index 6f17856769ae03978a4ac3917fca29162e475fb4..822b0f1fb9119927e2272f56f283620c792a0329 100644 (file)
--- a/dev-tcltk/tdom/tdom-0.8.3.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild,v 1.2 2012/01/02 22:13:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3-r1.ebuild,v 1.1 2012/01/06 12:19:24 jlec Exp $
 
 EAPI=4
 
@@ -27,12 +27,17 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
        "${FILESDIR}/"${PN}-0.8.2.patch
-       "${FILESDIR}/"${PN}-0.8.2-soname.patch
+       "${FILESDIR}/"${P}-soname.patch
        "${FILESDIR}/"${P}-expat.patch
        "${FILESDIR}/"${PN}-0.8.2-tnc.patch
        )
 
 src_prepare() {
+       sed \
+               -e 's:-O2::g' \
+               -e 's:-pipe::g' \
+               -e 's:-fomit-frame-pointer::g' \
+               -i {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
        epatch "${PATCHES[@]}"
        eautoreconf
 }

diff --git a/dev-tcltk/tkTheme/Manifest b/dev-tcltk/tkTheme/Manifest
index 15f96c5029fb00f70ca65cad6806c597d8e4844d..08c782f52289098f518971f47a256463789c27f3 100644 (file)
--- a/dev-tcltk/tkTheme/Manifest
+++ b/dev-tcltk/tkTheme/Manifest
@@ -6,17 +6,13 @@ AUX 1.0-cflags.patch 471 RMD160 9cdf1d1984a897955abdd2d371ccc0b8ca78c642 SHA1 be
 AUX 1.0-configure.diff 289 RMD160 2056ce9e3015a20f026105f8104fbfe83424c8d3 SHA1 63da8a66df5661c17d03080218f749c0e8eec81c SHA256 1889f9519b234308e445020233117b223646ac1c304aa2b2a1413da3a0a9eeb0
 DIST tkTheme.tgz 335061 RMD160 f54e94cc2f6b717f14534b2c605cab3d39897698 SHA1 6a9cbe876a82b26272a91fd163593feaa4831b37 SHA256 e6a2024d4a70ef69108020604de47885d21df09e558ba5cbfde7ccf67fc8a148
 EBUILD tkTheme-1.0-r1.ebuild 917 RMD160 84a33f19055a64b5cb95df3cb09a959e760c96e8 SHA1 ce2892bacf195aa7a119c13b60a35d0ef389a2f5 SHA256 0f1cdf256cc507e82764f7a5b598a5f8d3a8ff4e1b85826eaf9104a1df5a44f8
-EBUILD tkTheme-1.0-r2.ebuild 1136 RMD160 84823e6c99759b4de8a8f0433029cdcccc95be8b SHA1 74467fe47c4eedf6081613258eddca7bb53ffa8d SHA256 07208330c000e3de7dfdd94fb573ffa77cf93209b4aea74a042fd098603309d3
-MISC ChangeLog 2555 RMD160 a9b3ef484f42b878ffbe3f36382bcda2badd3275 SHA1 ec96cac1431475974f3ed677fc36b84d9490edcb SHA256 f1cd31831717eebdea0053fa9ed7fd251cc72d635532e7537196b5f757c1064e
+EBUILD tkTheme-1.0-r2.ebuild 1154 RMD160 8dc5f7bb0bb26c2e28fc34f47366f00c408d5566 SHA1 6973aa5b75844a990a787afee72e1df0d6573aa1 SHA256 3c1b6d8e9ab5007f56c69c1c0f993be25bc5d3acca207475768f9ef698b8512f
+MISC ChangeLog 2666 RMD160 068a5e10208b11d1df243837bdd2ff764e54e265 SHA1 13e13bb4342f9c362c7d2c43c1a5041d942faaf5 SHA256 7d1cec5f6180b8b94efbafa350b679482b3b4844683a869ab0abe3baa68e3d10
 MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPBti3AAoJEOTDgjZ80txd1hIIAIGfwmyn/k2/ti1kqnoxXiq4
-8LqcT5sdBjZqfIVlRtwf6XXUwjaun6YS/f2NmMSEpoH6s7thyt4XaCoWfLUbbTg/
-FbJgF226DWtlun+mh5SGVoA85IoKqx5w11VfxsfZpou26qVQ+lCLq6Y+RQiFaIjd
-hp0nJQrwDqZH+D4y2dDrLy0Loki8SShx1gt9kOSGJPqCKosurD2s56xMSLjAfsQj
-4MUxDxoDx2AFO9bw/x2xGTqh3Wztg3TtEk3cbEfy5VcTLgqAGDIScbwS22RlbgW9
-lCzPSfaN/Raagx/ahsdF20YtJU0OClLfEeLwqqUVI3/6Y8sDEVcICAOalpUzQNY=
-=8vaz
+iEYEAREKAAYFAk8G59gACgkQgAnW8HDreRZZQQCfdc4D9J7DCTDCYaQfwrLWmLXJ
+YXEAmwROiwJpxq3TEE0j1Oh90XtmmTd+
+=76eI
 -----END PGP SIGNATURE-----