summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-10-28 01:01:02 +0000
committerMike Frysinger <vapier@gentoo.org>2014-10-28 01:01:02 +0000
commit3121f5bd15e807a5f068a11e7ba2f5858a113f2c (patch)
tree0fb6889aa6fd53d96677a1837c02cdcd7b2a60ca /sys-devel/libtool
parentVersion bump. (diff)
downloadhistorical-3121f5bd15e807a5f068a11e7ba2f5858a113f2c.tar.gz
historical-3121f5bd15e807a5f068a11e7ba2f5858a113f2c.tar.bz2
historical-3121f5bd15e807a5f068a11e7ba2f5858a113f2c.zip
Version bump.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'sys-devel/libtool')
-rw-r--r--sys-devel/libtool/ChangeLog10
-rw-r--r--sys-devel/libtool/Manifest35
-rw-r--r--sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch20
-rw-r--r--sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch65
-rw-r--r--sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch38
-rw-r--r--sys-devel/libtool/libtool-2.4.3.ebuild95
-rw-r--r--sys-devel/libtool/libtool-9999.ebuild11
7 files changed, 165 insertions, 109 deletions
diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 58e9708727d6..63872204a6ad 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-devel/libtool
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.226 2014/10/27 23:16:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.227 2014/10/28 01:01:00 vapier Exp $
+
+*libtool-2.4.3 (28 Oct 2014)
+
+ 28 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+ +files/libtool-2.4.3-use-linux-version-in-fbsd.patch, +libtool-2.4.3.ebuild,
+ -files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch,
+ -files/1.5.20/libtool-1.5.20-version-checking.patch, libtool-9999.ebuild:
+ Version bump.
27 Oct 2014; Anthony G. Basile <blueness@gentoo.org> libtool-9999.ebuild:
Fix libtool-9999 in preparation for 2.4.3
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index aa7d575b6ba3..f3efba84e58c 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637 SHA256 08422e5d6dd2f01b4bd2f065c910724772cbe6ad2632be2cf8279e4b50b61a47 SHA512 4ab93ec7ddc27fd06a82e4d35046380f74d39832de788bc8898379d50e0346f2be74e6026b1af219b43b946635b38c21f1a69a98a2a4561f2a71f518f64397bc WHIRLPOOL fd5998c4771053b821ea2fd367f12034b1576153c35e985287ee44d49847a986238c50f8c57451b05c7a5e7a2cf4e3bebf36806d916107dc4a6f05e17eecbce3
AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326 SHA512 17faaf1d725d246b7fcd94a9be99c24b0600db0dea40218eb5a8b3ef382f8e90bd6e70e9b21733e80ccf448ed588b589fc4dca5b13a365e6b7821a730c65faec WHIRLPOOL dc6d7ff7a1c42d40931f90fe69d5cb6094ea67de5a1c9461e47336d4b5d4b36dd9db6a19a72df00e474a6e0aaab2cd0545270184ad795f32cc344ac3956d0821
-AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d SHA512 c2d48569bb0391e42b9127ca37bc61630f18231fede33d460e9abfc0fb57beac475f9a7376317bf25b373ccd5faa9345ca8c93da117b29d5bfd904daab2eaf12 WHIRLPOOL a18dda5b4d4bc367961d16e2270389d57026161ce720e6aba60a25932072c1451123ea7ce3114ad9e3bd55d4112ad0c2b06551712aeeaa1d3b7b31ad9093fb32
AUX libtool-2.4-openmp.patch 2289 SHA256 355bb3a6f92ae46dd723551b0f11e5e5f8a584e21880e756e815704e8f7b74da SHA512 403b4b78b480644f341ba89961313f7c872174ad04e2f8d580950290837f605aa776430335fae7a040a530a6f91e0aff1d5d32ca612a1bb81f4793b5a54c37bf WHIRLPOOL bdaae61a6f0424b5ed42054fbd997ef37ca75a132f65d7b103a14a7551bdd6817af732ce168e35d445bdf618593e8aa92548e75b31628f7f390c30b74e846850
+AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1124 SHA256 4f081f5515b28be8496883a413c4c3597312e3780b3ba2732e28a33e0a61dd94 SHA512 6134fb39cf0e115a91cf69de175c9a088d405684139f8ba3dcf77f2c039e5f4603e2b70652f27bb59773aacb562560c1bcdbf439de1564bd19095d524b0ee5c7 WHIRLPOOL 360aa2635e2f26e94558428ac8d0921ce3d88ba9ec7906a63431a2894627d98b78c69af66a295a7dc7a3e59c4670bdfff0bfe08bccd31baa261410c8ac963492
DIST libtool-1.3.5.tar.gz 538884 SHA256 02e287ba621aa01ee581b0f88854deb222fa61e7e0fc55ed7685038354f0259f SHA512 e7e693da0e87bc3b178b270c1d5b0d46116d1624f6e3657ad75bc381bcbba8949ab0913fe3985c77e9dd0ee519df7da9c5ee3b4f6030ad1d4651de2e642c4bd6 WHIRLPOOL 038305555932f7554c5e50932a0bf8cd0f2a8007c26fdd21c81dc7c44ca9076d1086e3c05911f62719685bd7aa6b14463f3a1160bfbf6090bcdba6a162d95630
DIST libtool-1.5.26.tar.gz 2961939 SHA256 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09 SHA512 fcd39856c8cd457c97f176d5f6ce97fd93108808ce24315d179a7c9ca85bb90e799afaa83bc283ec627d73cfe0e0710d36a1ee8f39c9963cf2e806e64a0e0bcf WHIRLPOOL 0a56e666ee7ec79b74b500e761ebddc94fb3d322b1c29c3f9929071f71a339b3082faa486b75c7cfcf72182976a8d6152585ca92c08735a512c07eff80a24ec4
DIST libtool-2.4.2.tar.xz 868760 SHA256 1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407 SHA512 34f2d4a32beb4d85cfefd9c2c4ff33b0117e9e89c6599c303a7b850c43be5ed090b2f530388b8c8154e8f3f693abd2079180dca9afc948feb800b2e009bed169 WHIRLPOOL 300697c30b6cf693463338ee3bfe10b9ccce2c496b319862182124828caf7b667a7e9cf21f287572ec1fed8abe529a14d171da2983369522faf3eed5513a1af5
+DIST libtool-2.4.3.tar.xz 947692 SHA256 65f940fbcb5f0727b10d759898afa35307b24c0945fb12f3f8387f5adb862ceb SHA512 36a5fa71dcb46cdb5d2149c061e1ea6940cfa07322f10fa39f6da5e2c1ce95742da1c12ab09af97abc91cda3d5b453967a97e183574863afa717bcd6118108c6 WHIRLPOOL 1f7af88f1a958371f1edc22f15ec77fe6eba98e681678fe955a314a74fe4f85de5a2c009153c108cc39c2580d04d877f60fb3f2b9ada9824505993cd4e415948
DIST libtool-2.4.tar.xz 852248 SHA256 afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae SHA512 6b706656cbe8a18d9b377b913d7430984abe4bcff1db1bfba3e32e7eff38eca433cd95a507f8aafd96daf28e6426eed14c98fcdb79bae63d56c93503d107b4df WHIRLPOOL 1330996e0a30dcb187eedc88a4548fab11f0585e4a30774572e65b9fde02502fc0c032c3c342ccb0bcf2fd4b895f1ea2c17c81c1f5f4c2f7b5a1b8dfe6a52ef8
EBUILD libtool-1.3.5.ebuild 799 SHA256 e954a743ece6084861556a273038c9c2fb4bd33e611cfb5359877cda183a0523 SHA512 1b48e03e395a58893405f5ed36e55ecb2a4047f58a406f38e743346608ebf94a8780035ab7e2bd6c4238108533aa462a871644e76e621d8010533de5f62b66ee WHIRLPOOL 0992a206f92b5e2fdcc9e876671d845fad06104c45b0d5e5c651e5950284962b2e3416c1006cca01f719326b1c4e168e90737135bf8a41328872ed9dd85c4dfa
EBUILD libtool-1.5.26-r1.ebuild 802 SHA256 51fcf1490d05f1377f056a2445f2a6945c6ece7835bbf4df80ee6005820e5f25 SHA512 5078be34d000856ede7b2760fd98d1b4fb538cee4e9db1042d391a98641de4d397c3686a890a11cbb2f921c35f78d5eb29355e9584c02cff5987f6e14829dff8 WHIRLPOOL e1b06bbb2e8cabdba5bb8ab46476d8bb821f3ad5eb463f5029ef4c11b38d5d696cd747365dd3f56074d14939bb9170aa628ddc15c8fc3c2e6074a41ec13a10b2
@@ -15,23 +15,24 @@ EBUILD libtool-2.4-r1.ebuild 1860 SHA256 134dc2a2dd2b71d8ac5dc6bd3f0e4535d031407
EBUILD libtool-2.4-r4.ebuild 2753 SHA256 9070fd9cc352f4a1158dc5e019e68b5f36cc2dab67bf1f1a41f36c3e5241eeef SHA512 e31b8d7e91c3358a9e63293f348c0b5044ea8f4a404c10c9b6537abc9261f4bdf0fb0a3fb5eaac7752905b74d9eaf24acc8b65d6f3e3175d7ff85851ed9a18ea WHIRLPOOL 07f373e88b2e439ba6b7282b17b3da20a3115ba45ec180ada6473e63d4d473f98d93b3511abc57c79a7e87e552e8ccf2ae8d396b5f0ed44771831ae51607a8f6
EBUILD libtool-2.4.2-r1.ebuild 2846 SHA256 d363a162685573430c2c4e0b50e5ebe5c8faa7584a6bdacf093803ef5837693b SHA512 927845575ebe67cf3db3cd21a3cd180d143b6d796dd0a7490c9770b2c4e78bf2c9893d1d5ca06b27f5090cc3916671320ba1a9ffce8aef68561798087298a92f WHIRLPOOL 65a363bbb770c1ab3c7d46e6d3b99a1b9499acd7b65f2a6cb407281aa49ca58976d99d8f08221a2c252d2a47eaaac1dbdaad38a690e45047ebba430ed33c6024
EBUILD libtool-2.4.2.ebuild 2687 SHA256 8a389b8d5e1b00df338eb93188e916da67fe6f2c019d73a5bc5a49d98d88eae8 SHA512 6372b7e6141770146f0917c01e35a333f285717ea6275343f3184fa622d74624494961dde54c776ed2f895bdbca8637a3d605c4feab06a509cd7b6d4258bb001 WHIRLPOOL da3c1743617d4ca304b715a144bf411de13254b6c5e9d675ab8e0f1a2cdf7d2fb5b6e21af446c753aa7745638c39cab3b596310dee89f885a3a2e3e2ed80ca54
-EBUILD libtool-9999.ebuild 2813 SHA256 ad13a3e2fb5b239808e57b45ab5083ccd302f02d7828e435070c3d6e8bd6a5b5 SHA512 b3956b6bd8f906ee98d0f667a1f9acccbb5311fcb50c718cc04b0df9b3265015ac18165cd93d72f8f12f94b5d771fb4ba8e69cc04df6d4975769030ad030baeb WHIRLPOOL 4a7edf183dfde19824eb2764efcc5b2e6bb4334c3622ec983795aee5db461aabfea79f09f2df6824a47fe7114364afd89c1f110da77c3112c32b0b3f71ebf1ac
-MISC ChangeLog 33004 SHA256 9157d3f1ff9e28e7570e3ae4eed83d168d7839ddc6cd8932fc796e975a5367b8 SHA512 ac50ff62e1d75b545d22de81a608ae9d237e5a23589856d56f8c638a677a3779035bba1b0b00cea4540784013d776429546be34eb45b89d2d89f3b5e2195c772 WHIRLPOOL 3251e796c20d6df48a3e7733938b4c1571662b0e7d72c4e3f02d0a99fe87203deb8aaf7d4d4c4ab96f2da3434a9ba30b6082c37669a1598c65899a05d6dba565
+EBUILD libtool-2.4.3.ebuild 2861 SHA256 3afc81079fd4b410a53b3ed1626d4c5cd2d7b7b7605fbfe68b9f46e718c24040 SHA512 e886687c33d12767d39c1fe8d28aff93e8d57893b0ad35bb43a920c3de220b08b538afff6c3554aa58783f7527da3d3e2459918f8a572f392adbdec82024143d WHIRLPOOL 2d0e23655f6f66bee202d03e5c1df9d166e55043bb80c1e4f84e40b7979583fcb9f615e81eefbf12764269b711f57dc50d119204f712e3a2627ae32f82518300
+EBUILD libtool-9999.ebuild 2824 SHA256 bd892fc98245c589ee733cf8d6acda3c938555e830f7cbbcb103d596cb4b14de SHA512 92a961614856c5d40299183fa00966cf1872a13cbba5e676c4b08a1fb1835e540e96969c2a8ca9eb08bdc754f69eab87c9889ff960f6507f8cb7dbdfe0c46e0b WHIRLPOOL e56477ccb31ffe67aaf6a25f805e750a98c7915bb6fc1c84f35bc0084450e67ec8c660a66035389bcbac5822e14f6d4dcc46bfe7933b162347f9ca47c63043c5
+MISC ChangeLog 33317 SHA256 4289e4a8d2661ea87d4427129f3631cb0254d1bc1d91a80ef0853fe842aaeb46 SHA512 751713f5d3bd2279869edb4e3c0b312a67f8edc61b905deb787b6d4c487266de136ef691e228d35a939130315dcf398c92662a6af32dd8eecaf0ae919c7f0f27 WHIRLPOOL 1a987b065f052d4b38a851c57db27008cdc1a6b88d3bffd6ac4f1c46c7435c5539fb9cecdfdd3a4b3a01764e05c2b0bead4284cdf69feccd3649f4f5a4216844
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUTtKyAAoJEJOE+m71LUu6fykP/2A3NODtmmTWrAnU8SLeX21P
-+aZnBLlNq8yJ/3H8MisEq0uVjr63UjKLgaFXnG1pPfTMsPIo0++4eSI/GikqsSlc
-r3CV7gYf/9PrcCbshsxToUnxhMSkxKDHlX14UJJeQSFZT3p8/ebien2NZQ8Bkh8f
-ma4Dfq4/fbmYsikojCz07eAvu2psD9b8IH+KK9UGwC3HE4lmmdR+CQznRZwaxV44
-Ho8IrtyTEiFHZcVKi1OvYIp3NXANq/ieU7pfGie84XbrPDVIoNtgMqHRDbho9+pY
-oj7gfjSVwKBzPz7e6F9QEIU1bp3xSqTZ1b9lQGv7ryA+QPIjLAhEkgQebpPu9v+F
-54hlDqUgp6Bo+QVYQPLqZ96ofMXs0WjSdb9teKRbPqLEFqRu+JlWLckHnrr/XlbR
-I4+4Jklv6JROLR1VNRy/UK1X0nb9TFaVmW33iOyco35N21hAlrnkazBDrXLHENLj
-k2ePZPWSg2nqO4dfvgmOgSm48PI5k5UFdrX6Xy0Qaj3+25c+0O8JTicoDWbiJj3s
-A8osZtM/Nyqi2G+79uZds8vviplcErlCQbcglyOdV8qcZmA8Wi+W9U/CJxGGGZxx
-uBs9Tzh+91jEWaClEBJ6PRjiIhtL7lomBEE//LiTdjS5lA7Q3lbbljwuQNV3c7EC
-VSerf0nd2VEjIk+bHRzE
-=yAeH
+iQIcBAEBCAAGBQJUTurOAAoJEPGu1DbS6WIAd2IP/RfJn/syTpHY1dJHPS4Ul62B
++IX/e46zukXq1kaEST+ZCvz86dLwZcmNWD5S9HTkH2pnhel90zpGGyDLshVnV3qM
+Z9/Xp9Uh+C6BlIeJuqI3f7UE2zorocvBStSew51cAcjOwhi/y11VOFVYEVZliM9J
+fbTHDTx+YzwNSuafs/fm+/XSmHKHqp6D1EMeOdCS7JrXDkYmrBBN7T4mYbUdpIDo
+CZPsYZbYCmNGBic1U7Cx2fQ4HsB2Ih+fPYf7Rj0iBJ1Tja+LPVAo9ZdM6YKpuABO
+zYih8NPjYe0mcsFFn6aXD88FDaILCs7rZgVWQsYTZNWBTlR8QB9Y/IPWYqTnTUpr
+hpJwYqY/VUCRLzZJbMOLrMWobGSOKJSlpOanWRaq1t/OGAC2u7SIBI/jYmh5bNBr
+JZ/NIc4shU/oCCoLnhOmHr4brkdd3GmvSbJlfPTIyJ/UHOJh0fvN9HXShpkKep0d
+8fDeGHdfRKdYyB1ILNGX/KkI7obWbvy8LbB+GBZBkAnVAp8//z4cHmUTVTj4sTbL
+pflGKUN5MxllqPjkBOSE+Ar/FgxP/KTLaslspn4Io5D6hSsHFG8atFakfb0BPgsg
+VZd388LSWUKoFV/ZqRIcDDkqgwLO81JynZMNSN7MWQvN2DHzNpxZ7rmspNbfB333
+QASdK7soSvlyE5NXhKr4
+=7Ja/
-----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
deleted file mode 100644
index f0bdad87ce3c..000000000000
--- a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix build time issues with tools who like to export LD_LIBRARY_PATH
-to retarded values.
-
-http://bugs.gentoo.org/99593
-http://lists.gnu.org/archive/html/libtool/2005-09/msg00053.html
-
---- monkey/ltmain.in
-+++ butt/ltmain.in
-@@ -5085,6 +5085,11 @@
- $echo >> $output "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
-+
-+ # Make sure env LD_LIBRARY_PATH does not mess us up
-+ if test -n \"\${LD_LIBRARY_PATH+set}\"; then
-+ export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
-+ fi
- "
- case $host in
- # Backslashes separate directories on plain windows
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch
deleted file mode 100644
index 8d6f4f38172a..000000000000
--- a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Add a sanity check to make sure the libtool code in the 'configure' script is
-in sync with the local 'ltmain.sh'. If they are out of sync, libtool may
-generate the libraries incorrectly.
-
-http://bugs.gentoo.org/73140
-
---- libtool-1.5.20/libtool.m4
-+++ libtool-1.5.20/libtool.m4
-@@ -212,6 +212,14 @@
- [pic_mode=default])
- test -z "$pic_mode" && pic_mode=default
-
-+# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
-+#
-+# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
-+# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
-+# calls AC_LIBTOOL_CONFIG and creates libtool.
-+#
-+_LT_VERSION_CHECK
-+
- # Use C for the default configuration in the libtool script
- tagname=
- AC_LIBTOOL_LANG_C_CONFIG
-@@ -219,6 +227,41 @@
- ])# AC_LIBTOOL_SETUP
-
-
-+# _LT_VERSION_CHECK
-+# -----------------
-+AC_DEFUN([_LT_VERSION_CHECK],
-+[AC_MSG_CHECKING([for correct ltmain.sh version])
-+if test "x$ltmain" = "x" ; then
-+ AC_MSG_RESULT(no)
-+ AC_MSG_ERROR([
-+
-+*** @<:@Gentoo@:>@ sanity check failed! ***
-+*** \$ltmain is not defined, please check the patch for consistency! ***
-+])
-+fi
-+gentoo_lt_version="@_LT_VERSION@"
-+gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
-+if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
-+ AC_MSG_RESULT(no)
-+ AC_MSG_ERROR([
-+
-+*** @<:@Gentoo@:>@ sanity check failed! ***
-+*** libtool.m4 and ltmain.sh have a version mismatch! ***
-+*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
-+
-+Please run:
-+
-+ libtoolize --copy --force
-+
-+if appropriate, please contact the maintainer of this
-+package (or your distribution) for help.
-+])
-+else
-+ AC_MSG_RESULT(yes)
-+fi
-+])# _LT_VERSION_CHECK
-+
-+
- # _LT_AC_SYS_COMPILER
- # -------------------
- AC_DEFUN([_LT_AC_SYS_COMPILER],
diff --git a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
new file mode 100644
index 000000000000..8244eaa7e3e7
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
@@ -0,0 +1,38 @@
+Force linux-style versioning when generating shared libraries on
+Gentoo/FreeBSD hosts only.
+
+Patch by Diego Elio Pettenò
+
+http://bugs.gentoo.org/109105
+
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1375,7 +1375,14 @@
+ *) objformat=elf ;;
+ esac
+ fi
+- version_type=freebsd-$objformat
++ # Handle Gentoo/FreeBSD as it was Linux
++ case $host_vendor in
++ gentoo)
++ version_type=linux ;;
++ *)
++ version_type=freebsd-$objformat ;;
++ esac
++
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -1386,6 +1392,12 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
++ linux)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ need_lib_prefix=no
++ need_version=no
++ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
diff --git a/sys-devel/libtool/libtool-2.4.3.ebuild b/sys-devel/libtool/libtool-2.4.3.ebuild
new file mode 100644
index 000000000000..c2bd8c521b62
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3.ebuild,v 1.1 2014/10/28 01:01:00 vapier Exp $
+
+EAPI="4"
+
+LIBTOOLIZE="true" #225559
+WANT_LIBTOOL="none"
+inherit eutils autotools multilib unpacker multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
+ http://git.savannah.gnu.org/r/${PN}.git"
+ inherit git-2
+else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="static-libs test vanilla"
+
+RDEPEND="sys-devel/gnuconfig
+ !<sys-devel/autoconf-2.62:2.5
+ !<sys-devel/automake-1.11.1:1.11
+ !=sys-devel/libtool-2*:1.5
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ test? ( !<sys-devel/binutils-2.20 )
+ app-arch/xz-utils"
+[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ cd "${S}"
+ ./bootstrap || die
+ else
+ unpacker_src_unpack
+ fi
+}
+
+src_prepare() {
+ use vanilla && return 0
+
+ epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
+ pushd libltdl >/dev/null
+ AT_NOELIBTOOLIZE=yes eautoreconf
+ popd >/dev/null
+ AT_NOELIBTOOLIZE=yes eautoreconf
+ epunt_cxx
+}
+
+multilib_src_configure() {
+ # the libtool script uses bash code in it and at configure time, tries
+ # to find a bash shell. if /bin/sh is bash, it uses that. this can
+ # cause problems for people who switch /bin/sh on the fly to other
+ # shells, so just force libtool to use /bin/bash all the time.
+ export CONFIG_SHELL=/bin/bash
+ ECONF_SOURCE="${S}" \
+ econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+ # While the libltdl.la file is not used directly, the m4 ltdl logic
+ # keys off of its existence when searching for ltdl support. #293921
+ #use static-libs || find "${D}" -name libltdl.la -delete
+
+ # Building libtool with --disable-static will cause the installed
+ # helper to not build static objects by default. This is undesirable
+ # for crappy packages that utilize the system libtool, so undo that.
+ sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die
+
+ local x
+ for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+ ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die
+ done
+}
+
+pkg_preinst() {
+ preserve_old_lib /usr/$(get_libdir)/libltdl.so.3
+}
+
+pkg_postinst() {
+ preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3
+}
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index c8a15ce1d2c6..ae378b34ba79 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.17 2014/10/27 23:16:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.18 2014/10/28 01:01:00 vapier Exp $
EAPI="4"
@@ -49,11 +49,10 @@ src_unpack() {
src_prepare() {
use vanilla && return 0
- cd m4
- epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
- cd ../libltdl
+ epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
+ pushd libltdl >/dev/null
AT_NOELIBTOOLIZE=yes eautoreconf
- cd ..
+ popd >/dev/null
AT_NOELIBTOOLIZE=yes eautoreconf
epunt_cxx
}
@@ -82,7 +81,7 @@ multilib_src_install_all() {
local x
for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
- ln -sf /usr/share/gnuconfig/${x##*/} "${x}"
+ ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die
done
}