Clean up elibtoolize logic and re-sync 9999/non-9999 ebuilds.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

3 files changed, 31 insertions, 20 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 456b5e41cfbd..6ab16e1df5ae 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2012/11/24 20:33:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.54 2012/12/07 22:15:01 vapier Exp $
+
+  07 Dec 2012; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.4-r1.ebuild,
+  xz-utils-9999.ebuild:
+  Clean up elibtoolize logic and re-sync 9999/non-9999 ebuilds.
 
 *xz-utils-5.0.4-r1 (24 Nov 2012)
 
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
index 659f22bce438..a7df0d0c00f4 100644
--- a/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
@@ -1,19 +1,20 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild,v 1.2 2012/12/07 22:15:01 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
 EAPI="4"
 
+inherit eutils multilib toolchain-funcs libtool
+
 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"
@@ -21,8 +22,6 @@ else
 	EXTRA_DEPEND=
 fi
 
-inherit eutils multilib toolchain-funcs
-
 DESCRIPTION="utils for managing LZMA compressed files"
 HOMEPAGE="http://tukaani.org/xz/"
 
@@ -36,16 +35,14 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
-if [[ ${PV} == "9999" ]] ; then
 src_prepare() {
-	eautopoint
-	eautoreconf
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
 }
-else
-src_prepare() {
-	elibtoolize  # to allow building shared libs on Solaris/x64
-}
-fi
 
 src_configure() {
 	econf \
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 080cf71044ca..e3a22b079834 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,12 +1,14 @@
 # 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.13 2012/11/24 20:33:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.14 2012/12/07 22:15:01 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
 EAPI="4"
 
+inherit eutils multilib toolchain-funcs libtool
+
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
 	inherit git-2 autotools
@@ -20,8 +22,6 @@ else
 	EXTRA_DEPEND=
 fi
 
-inherit eutils toolchain-funcs
-
 DESCRIPTION="utils for managing LZMA compressed files"
 HOMEPAGE="http://tukaani.org/xz/"
 
@@ -35,12 +35,14 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
-if [[ ${PV} == "9999" ]] ; then
 src_prepare() {
-	eautopoint
-	eautoreconf
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
 }
-fi
 
 src_configure() {
 	econf \
@@ -56,3 +58,11 @@ src_install() {
 	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)
+}