Version bump.

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

3 files changed, 89 insertions, 16 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index eed42e3c50af..1e935dc7f57d 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2012/05/17 04:05:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.44 2012/06/23 18:27:00 vapier Exp $
+
+*xz-utils-5.0.4 (23 Jun 2012)
+
+  23 Jun 2012; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.4.ebuild:
+  Version bump.
 
   17 May 2012; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.3.ebuild,
   xz-utils-9999.ebuild:
@@ -165,4 +170,3 @@
   07 Feb 2009; Mike Frysinger <vapier@gentoo.org> +metadata.xml,
   +xz-utils-9999.ebuild:
   Initial ebuild by me.
-
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 73d977dc6f82..80d834aa2f45 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -6,28 +6,30 @@ DIST xz-4.999.9beta.tar.gz 1037541 RMD160 1253ce01746c748c8549effa5041224044919c
 DIST xz-5.0.1.tar.gz 1236843 RMD160 b4ea20bc85024bbe11cf02941e2259a0d44b8a61 SHA1 a5e7b697d4413f79e36a6c5959ece3db40938c1c SHA256 3770b8872a4322b9502937b4781d523303bf193962c4822899fd3a210878fc80
 DIST xz-5.0.2.tar.gz 1241178 RMD160 9ae8c5021e02ac3122ef323575b7124a2bd20d90 SHA1 2f64e90df16a4cc143bf7ba5788953fac593f4f6 SHA256 57e979baaa40147dde1bbb284e3618f8f18b6532c932648bd57b5aee674b98a7
 DIST xz-5.0.3.tar.gz 1257140 RMD160 81f8a268dad49f46e4b4cacf9dd5bc23525170f5 SHA1 50ce842bea6519537457d9ad90d110a127656786 SHA256 10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf
+DIST xz-5.0.4.tar.gz 1281166 RMD160 1aab29e0c2c2a16e87a5b322f6c760824d275f45 SHA1 3e976d7715fde43422572c70f927bfdae56a94c3 SHA256 d67405798dad645965fe51cf4e40c23d1201fb234378d3c44f5a3787142b83b6
 EBUILD xz-utils-4.999.9_beta.ebuild 1464 RMD160 02e22e11458de34fc93fdcf0d2fc447a0261e41e SHA1 6e51b404d3e2cd3e0b8a1bf13c6c63584eb5a5e2 SHA256 a0f2d0c5734466bc350856cb7e9e948b4232ae63d5b42ad150d2d522bdf8fbea
 EBUILD xz-utils-5.0.1-r1.ebuild 1681 RMD160 dedad6da19c0b84c7b9944f5a6b4aadfa7b073ec SHA1 5e6d674d1479c7b2ab46a944e1f216d2a2cc4d01 SHA256 d3f03e032d639b4317f9370ec549b59aa7695cc35f13ca44a170f1cda3036181
 EBUILD xz-utils-5.0.1.ebuild 1595 RMD160 85246768d0aa4b8a8a66480b4c357fcb825b1404 SHA1 29a117f94e4284bca2014480812386c52122063a SHA256 ec77f5df32f6c6f1069544bdfada81a7a32e4418fe6bb013dcb246e08e22a0d2
 EBUILD xz-utils-5.0.2.ebuild 1685 RMD160 e788b2607005bf1b2e8c84da833a6bd59e9f8e54 SHA1 181e0453cc88d7f1b6454f1bfa4a865b3c3031bd SHA256 aedca58672d5f10d617cad24ccb2afbdc32f3255def5b9b57568ec9001e07471
 EBUILD xz-utils-5.0.3.ebuild 1678 RMD160 5339df594eb1402da897f3e0566209108ad3981e SHA1 f54a81c8ab2732409f1276abc7a6009b1771a442 SHA256 9f08362e86257864070388a2d3f40b3ec52cb5b62492c4f59a313d61fbd7f346
+EBUILD xz-utils-5.0.4.ebuild 1691 RMD160 505576aa2531491309aad1b3dfd83bd46f30a1ae SHA1 49fe4b53f04972a9db683796adb6a95de3355485 SHA256 aa79d1fd621d2e4405f0d5bc789447a3dffe42f7eb3770171e4f86e2fbdd525a
 EBUILD xz-utils-9999.ebuild 1536 RMD160 811044fe6b5149290e984a5720689cfda5209d31 SHA1 0a624ab5671c8db39eba03d1eba6b2f44bc01abd SHA256 1bb5b5daa0f2a4fab04f88e3e61f12ec223cc5ecb848a498927ef559547a3b3a
-MISC ChangeLog 5697 RMD160 dcd9085491bc5091e35356b7caf01fc638aea24e SHA1 250c06675b9482ef7557a561f9c7c64aa9621209 SHA256 44f3e6724cca60e9b63f7737abb7baf8d3e24397b7a8fb65e0e05476344a9b12
+MISC ChangeLog 5818 RMD160 d5d54bf690c54b470c0cf1ad4dabdf4e936a718f SHA1 96c323b448c35bb2d419b573c511b9363d14e433 SHA256 78cac496982f7745004f6e985d0d6aae295c9141c3415e64d23eb1ad9dd0ca2b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPtHkeAAoJELEHsLL7fEFWbEoP/ihPFl4iDt90Dw3ym+aHh5Uq
-yD45/7vNyFhnZfFfZtG16q7WyfZZhO2LnxZY3Nlu77uDKWznP01wSZHH9fAHXCqe
-DBXyJygeZkJxIWAP5oVk+mAsImNtloSUed8BrkP+WO7ip3aiYTddKnWXRY88H7dF
-JOBaFlzoI0eRITkRH0Z0jSixnz1DFmpf7MEZFCLSSsHg2gcPy7p8YZl0XOw8UZd6
-4dSPvyzCtc+tb9WLG2BRjtDSM+8Pflb4ri9PF7DXF9p6vnBMwKILfDIYoIJEILP+
-jzKybR8F9WcVOn6ErD4jFOfAdZyfT10/EaE3+T8zxPVj4FNb+d89ghnAYtY8VzMg
-iQjmlE6USC8NxythLggLTohvre7isW1vjjDSnetkdiB4GxLylYnVwRfWccAjJHRa
-gbw5rrQ+k6SwJr3AnnR0ftz3/IyQGSCZchphs4pe2Irm/lc2sJi2rzHNNJQj5L44
-/tv1xPmWHJS9WecfCXJlVYMDi/PzIKvCHp+1qm6UHreoM9e8uI+w5SWAAiQczZok
-M25g+QIVg1Xw2tKM2vh9u2RjodcrHsgtcWXDw93GTKITehVOfO3HZ6V7cfFjDfan
-rNfrV/RY6rk5RMi//SjJmCuOh3qnqdL+T3tUnwkUVFG1MUoocMmta+08RvIgPp5i
-EF955yBLdMAm073j+Mbe
-=08Gu
+iQIcBAEBAgAGBQJP5gqaAAoJELEHsLL7fEFWPWkQAKca1cA+cGGoJsXVYb81eE/u
+/KyVZKnQGOIV3EgeMEHrON1PV7qBCsgHqFi4zBYZk9i1Scdo5fGIIYAX7fVX2HkH
+ltkuQhtSjgd6aEVQQM+Bh459CH2N8M5sLgxuUy3EomVkwlEGDQd45nLvsiCbS5H8
+4DzvCa1EU2Y62dlxuy8x6jQZwz7zEl9asdeVo/sMb/mkdTqEB4IJcHQYwq8CFY3c
+2akTFQODKtD3TpFvrRCeJdL9/YOQK4YLT7kqVoxBYwHYxZ3h/wfJ9OoL2U0UWx3h
+4RAtee+GxwTfpVXlTRLBIZCIRCPCAi3El2qeZOPIHBh8YN5vrqgBHAC5kJND7N2B
+253iyP3Somu//GIbJ8J24Xf64YPjTKUIW9xynWoZ2F86Y1C9vA+6+xp5CUnFZs+t
+XkYZjPWDJrlUk55qgg+RiNKTrPGOxjnYH0SVqjpIRVg9iCpgOIZ8saZ9c5mLwFh9
+h16LvmHsffIih9VuJ+5nGuAyua979U/nEdUWGeH6Qo1F5CVvamiIg6k6cEEaJI2g
+rOWmC1BKPR8LLdOhO4t+3EESN3vWiHDGqAf/oN8ecvvDSOCUl9gxkTKCBa02Gdzq
+ziG8kx6M6edU2oJnxbDHO7E7Jy8srkTj7Zy+CL1wDnYDk2HNxv3lxGGE12ycxJQP
+AdFRAUjttGsQWR+TutYG
+=gQpG
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/xz-utils-5.0.4.ebuild b/app-arch/xz-utils/xz-utils-5.0.4.ebuild
new file mode 100644
index 000000000000..9afde9b98127
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.0.4.ebuild
@@ -0,0 +1,67 @@
+# 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.ebuild,v 1.1 2012/06/23 18:27:00 vapier Exp $
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI="2"
+
+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
+	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"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+inherit eutils multilib
+
+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
+}
+fi
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${D}"/usr/ -name liblzma.la -delete || die # dependency_libs=''
+	rm "${D}"/usr/share/doc/xz/COPYING* || die
+	mv "${D}"/usr/share/doc/{xz,${PF}} || die
+	prepalldocs
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma.so.0
+}