gen_usr_ldscript -a lzma

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 94 insertions, 10 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index fc4bce1894cf..456b5e41cfbd 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/xz-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.52 2012/11/09 19:38:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.53 2012/11/24 20:33:49 ssuominen Exp $
+
+*xz-utils-5.0.4-r1 (24 Nov 2012)
+
+  24 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xz-utils-5.0.4-r1.ebuild, xz-utils-9999.ebuild:
+  Use gen_usr_ldscript -a lzma to move liblzma.so.$version from /usr to /
+  for sys-apps/kmod wrt #443710
 
   09 Nov 2012; Fabian Groffen <grobian@gentoo.org> xz-utils-5.0.4.ebuild:
   Run elibtoolize to allow Solaris/x64 to build shared libs
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f884f28993bd..2c3a6b9c7c0b 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -12,14 +12,19 @@ EBUILD xz-utils-5.0.1-r1.ebuild 1681 SHA256 d3f03e032d639b4317f9370ec549b59aa769
 EBUILD xz-utils-5.0.1.ebuild 1595 SHA256 ec77f5df32f6c6f1069544bdfada81a7a32e4418fe6bb013dcb246e08e22a0d2 SHA512 1a09f974b30fc4560b1df79e6884b0dda430c536eb9f3566e4c404ab395ae9a56c71e9158c35a631c8f94d5c673938f72d3353f1497c959e75a6441000a8a7fb WHIRLPOOL fb05a918eda587654de241002de465cd46d0618d54705e0074acecf3b6c4a7f5307ec2a8ddba579839b8b635c5fa0a7580c1968f63fb24866f67df598c4feb72
 EBUILD xz-utils-5.0.2.ebuild 1685 SHA256 aedca58672d5f10d617cad24ccb2afbdc32f3255def5b9b57568ec9001e07471 SHA512 4880e5596cc486e240f05417b246a7fce9fc7f7f217a9f2fcfbedc6148940df43d31da5eaf0ad61c5e983aad20f4392eea1ad6d0e1290af0ee17e60932920641 WHIRLPOOL 352723e1abdc4663cb39a31b8df41cf84216f6cbac886a9b2e3076c8b138c08d56a69c5979a38ef4da1eedb53b72853c372131f42a8ae905627de6e9bc15406c
 EBUILD xz-utils-5.0.3.ebuild 1678 SHA256 9f08362e86257864070388a2d3f40b3ec52cb5b62492c4f59a313d61fbd7f346 SHA512 5731bfa63e70dee4b12b8caf166ac4bd5ed6446888cecf9a92322b50bfed3d36f972a8a6f79159787517245c56f168e1c524b8ffb1c9e251f1c47cdb43e59364 WHIRLPOOL bc8d1e5221fdc0feee598843e2ce38131407831300b6ef62a8f7963faabceff873df3934ae8e083d5d4031b58706436da1233dfd53ce6961d902ceb9c6b7050b
+EBUILD xz-utils-5.0.4-r1.ebuild 1930 SHA256 6b9e581a003ae01ec14a80367bb119c8960d389b66bea29ffe817e7042cebbda SHA512 ff71c753da876a577cf3ce469250af9ee7c09f53e1afb2f60d998c1ca0fb2023fac14f234520526c398fac7beb97889389e44ad3de5f7b3f87b0cb1f25024a89 WHIRLPOOL d6266695b61eba11da271109050ef5e75a278e0c8bdffa7393aae0c19ce3f44543814f698426c245b347f477d7249e337c02d742c69684a8c01a303d8b05a5ef
 EBUILD xz-utils-5.0.4.ebuild 1916 SHA256 2441fbe41aa27861136717702b49b419560e6f2290d326c51827dc1c75fbecb8 SHA512 d91c9930d2190d631de6ff3ccf8d177d9432bfce40ac6e09498070e50f48c026630ed0909646dd2c38e3a8be18f67e7b3f354b4f6f66f2e1dea85de16d739fc9 WHIRLPOOL 526580bc196c132b24585b18aeac5630099bcaa6857495a6eeba5247cd080ef6d0c190d9ed4608c76ca939aedc24938e57f5020928bfe25430c1dc8b83be5b96
-EBUILD xz-utils-9999.ebuild 1649 SHA256 8fb4f140434a2c510efdb87a32ca954cb36d784100b29563356090b74049f52e SHA512 143be3e647f735883c5619a5423c735ad7f13c0d8c6727f0e4e2b1b8bfb86db0dc0f850d619c2e031b5ba7404d0e9ece694720e9790324db5091345369c0de05 WHIRLPOOL f135507807c80142943cbb1bbdcc453bf2af8cfd9ef5ed20776ee75a3727b3387400612d8a7e75090185ceb9b1aac7b3f48a02788194e46e9c8a8b1b54012b2c
-MISC ChangeLog 6752 SHA256 b3489ffa2f3f01f8f6b8a826c879197259da5b4fa0f88a6c4f39646547e30c03 SHA512 22b50271a256106322a0e835c8ae521e76eab5b8542297f130f2f65220d41dd8e6ebd1fd6d34c08e8f98669871ef2d3b35bc050e039e0f77e6a38360c99b2679 WHIRLPOOL aea1ce09515a3204a0ea410bdba964ae294e0cc4161e29abb85c102862254539efa3cc2083a909f261eeeda70d1422fe76f44e2f990fb55d49bf351f8d3ef714
+EBUILD xz-utils-9999.ebuild 1649 SHA256 32a1859d6c36a7ef831650e53fa452b18b2e40a9f5ad7fee4a9ee8ca004aaaa4 SHA512 8442731fc79273e4d52886c9cd30a88666fa921139128a3d8e9642421b3e76962fb6480316174ba793017c6481b29bc64ea4cbd161f9d45654d593826c7eb5a4 WHIRLPOOL 0ad46ef16f62cbe5b8caaa9adcad4061fc7d2b970e053039b5dc2c6da214a3750bf9b1f279799ebb88e77d25e5dde6aeb05311ba9ad96156f98706be357e758c
+MISC ChangeLog 7000 SHA256 5f133b756126743c326faca85487db7ebba78100ab13b62bd9fe9b6debcebd68 SHA512 40e2f6d695034c2828b931e469d7950b8f661c9582ebdf8a93895f0de810999df65b93a11037b1866a94604e000ba45509ab0fa87bf9bbe83840ebfbcad6881c WHIRLPOOL a63f74b2f00fda8518125d51e81b7eb7cf7b312e41a1fc27b26148682db30cde5b86bb6f686330c0d9723f0249a620286ee1c592e90ed8ba908d4f26fe04c284
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCdW7YACgkQX3X2B8XHTomIkQCfalVuIavZkRLpumClVx6DtVTu
-qkYAnAp0CqlpGg5eFnU3lUXG8ySizyMN
-=kXvR
+iQEcBAEBCAAGBQJQsS8KAAoJEEdUh39IaPFNk3oH/AhGh80WCufBxe15JLFJ/QI/
+WKWRy9F8ru0U0fL1lIDRtJxil6skhfPXkj0Cn4a3ZXuX54dj76PKVISo2IaFVLUw
+6sLGa2nYGcTuEFNOZ3E5LB05dG2MG16VqNX9ac5JGb+uIkXMSAxiimK3zSkSXCNT
+xVC1hUnmmEtBj/005XVtOaL9vtdN/kbd1oozYIaEqyH1TFmUj77Fmlo4DhkCn7XP
+gYWsSPNSD54PecnuY5MHN4ds+YmZRHN6BPK9AsJ37u4xgMJuhJ5UkuNQLx4JBC+o
+P3XoEd0AlgzIDlbgt/ZB+CvOg95xYpf40PQeQFapbNZIdYeeyePl4NKUVqONg50=
+=T5/e
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild b/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..659f22bce438
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild,v 1.1 2012/11/24 20:33:49 ssuominen Exp $
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI="4"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	inherit libtool
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://tukaani.org/xz/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+src_prepare() {
+	eautopoint
+	eautoreconf
+}
+else
+src_prepare() {
+	elibtoolize  # to allow building shared libs on Solaris/x64
+}
+fi
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a lzma
+	prune_libtool_files --all
+	rm "${ED}"/usr/share/doc/xz/COPYING* || die
+	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 0191244adc6e..080cf71044ca 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.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/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.12 2012/09/14 02:24:09 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.13 2012/11/24 20:33:49 ssuominen Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -20,7 +20,7 @@ else
 	EXTRA_DEPEND=
 fi
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="utils for managing LZMA compressed files"
 HOMEPAGE="http://tukaani.org/xz/"
@@ -51,7 +51,8 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+	gen_usr_ldscript -a lzma
+	prune_libtool_files --all
 	rm "${ED}"/usr/share/doc/xz/COPYING* || die
 	mv "${ED}"/usr/share/doc/{xz,${PF}} || die
 }