Fix automagic bzip2 dep. Remove ald versions

Package-Manager: portage-2.1.10.36/cvs/Linux i686

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index e81ad3d76f58f3de6a2be49a7100366210093d07..f5ebac5f9a2dcd0147843b6cb1c3783867782b79 100644 (file)
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.382 2011/12/06 19:55:30 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.383 2011/12/06 19:59:28 darkside Exp $
+
+*eix-0.23.3-r1 (06 Dec 2011)
+
+  06 Dec 2011; Jeremy Olexa <darkside@gentoo.org> -eix-0.22.5.ebuild,
+  -eix-0.23.1.ebuild, -eix-0.23.2.ebuild, -eix-0.23.3.ebuild,
+  +eix-0.23.3-r1.ebuild:
+  Fix automagic bzip2 dep. Remove ald versions
 
   06 Dec 2011; Jeremy Olexa <darkside@gentoo.org> eix-0.22.11.ebuild:
   mark ppc64, bug 379603

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 043623d9dd48b433e942b0933684191da2827698..f878a33ee0a15ab9f77ea5133606787afda8a795 100644 (file)
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,12 +1,6 @@
 DIST eix-0.22.11.tar.xz 438672 RMD160 8b6496d7409bf2347f736acc998142aee4397165 SHA1 94e9a9c290ef4e6d4668b165a52bddd3860d6a4c SHA256 48e78234b4c0233b1e4532f77f941300b41dba892835738ad3c17a463564606d
-DIST eix-0.22.5.tar.xz 425508 RMD160 aae4b9d433b0d8359119744013953bdc85a07da4 SHA1 455de81092b0bf336792c4c0832eed58686c523a SHA256 f7905688eea16ed48e864ec59bafbcfb7cfce17b38a06e0824d1e2598b842c49
-DIST eix-0.23.1.tar.xz 440472 RMD160 cb2831b4c5f54fb223d707efe725cdc1bd0d424b SHA1 6604e40a27e745d9d58bd26d2a6f28e35f6cc0c6 SHA256 22079a4e844208a267f3f47f5c6934b2fddf4d00dd65f6867d52a9a7973ed0ff
-DIST eix-0.23.2.tar.xz 443336 RMD160 02a20f0c5a11a1555de4eb866e1d8a63a9de5041 SHA1 0872022ea2ec8babe2c05b993731610c66ec01ab SHA256 1e5612ad91739c9e4290075da82a66b29dda07e7d970118319a23660cb72f0e2
 DIST eix-0.23.3.tar.xz 443364 RMD160 ad7b6842ceeaa4d93bdf7fa6fcdc85f773b54970 SHA1 55d9a6ef2ebf07ba4293b9b2b78443658c47b12f SHA256 c9525a4f8605250469600667e364e2d9325d7964b3476653bb8908f28cccb828
 EBUILD eix-0.22.11.ebuild 1649 RMD160 15f66288e745fdbd908020df8eaa8d62091a38d3 SHA1 778b72003d55562dc87b86228595767a42e7f2b4 SHA256 c2fa25df5b0aa9e1c19dffc8b26cc462179e99bd5005d2a34431b3e61b460ee3
-EBUILD eix-0.22.5.ebuild 1608 RMD160 33dee63cca763aa3de48bc5c9fecd83a51ebbf2e SHA1 927a02c4b2d3eeb540095c3efb18da4d4c85f48b SHA256 a677780aec4d9201f1c188dd6c22adceb3529535304475cb5781baf0c2b9c598
-EBUILD eix-0.23.1.ebuild 1665 RMD160 87820ba0d8b6c5cddfdf13375d1251b859d1aac1 SHA1 10bbf367febb49a4db4d47f45c97c7a05d7c824f SHA256 58b0d43cf816af3cbb4bf9d69b41d7449ff686bc3783c7af58fe0ba1a29592ac
-EBUILD eix-0.23.2.ebuild 1665 RMD160 d3110c3e957e0788449bebce29d79ede31387a9a SHA1 7f828592db811db7b50b9b376cb3a9a32042ed27 SHA256 5dd3109f5d917d7127505670b4976964083cb1ef185daad895ef813bb5360bab
-EBUILD eix-0.23.3.ebuild 1665 RMD160 0e80eb06513cfd721fac3cb0d2ac1d3fd0eddf07 SHA1 ca7e307a28a291e6a72cd23325cdc7509aff05f0 SHA256 e8dbf1ed845fe99af836b2ccf02bd13ab55ac930fda3a0c29fd995e76c69c031
-MISC ChangeLog 47604 RMD160 bea18a7be7086821ec21f99cdd8ca853c2b05e8a SHA1 5c6c4ac0c1311cbb2b127a2edca4d19bcff02cf9 SHA256 33f95f7f5b712d58a7ecce9bc931caf9b16cf5864964ce8a685a5bed5cf8b9b3
+EBUILD eix-0.23.3-r1.ebuild 1688 RMD160 c19c45689765af3b926fdd6ae2d62eb5c897a925 SHA1 423481940e96d1490c96551af7eada34a71accbd SHA256 3c9a401f5947dc78ca32e93064d42a696ca0951371972cea7263c04ad68d67e3
+MISC ChangeLog 47839 RMD160 2b9118d0da1ec2d155a72c9e627ca45c9baf0201 SHA1 ffb42edf949dc1dc0f360aa980818bb7bf313192 SHA256 3ab3115a54f7a54316a3ff6813aea9bd4a6108120aad0f3d1064f3a572d1d26f
 MISC metadata.xml 2187 RMD160 83700dddba9f1d13654a68e20733f32392fe58f6 SHA1 873bfbc3a5341e384063971c39d207cf53321a6f SHA256 6ff1022411194f31ad7fbc919ec4fbecb2244f81f454516b0af737d025854a5c

diff --git a/app-portage/eix/eix-0.22.5.ebuild b/app-portage/eix/eix-0.22.5.ebuild
deleted file mode 100644 (file)
index 8af3747..0000000
--- a/app-portage/eix/eix-0.22.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.22.5.ebuild,v 1.10 2011/02/13 13:19:07 armin76 Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://eix.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+bzip2 debug doc hardened nls optimization strong-optimization sqlite tools"
-
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-       nls? ( virtual/libintl )
-       bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils
-       doc? ( dev-python/docutils )
-       nls? ( sys-devel/gettext )"
-
-src_configure() {
-       econf $(use_with bzip2) $(use_with sqlite) $(use_with doc rst) \
-               $(use_enable nls) $(use_enable tools separate-tools) \
-               $(use_enable hardened security) $(use_enable optimization) \
-               $(use_enable strong-optimization) $(use_enable debug debugging) \
-               --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
-               --with-portage-rootpath="${ROOTPATH}" \
-               --with-eprefix-default="${EPREFIX}" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       prepalldocs
-}

diff --git a/app-portage/eix/eix-0.23.2.ebuild b/app-portage/eix/eix-0.23.2.ebuild
deleted file mode 100644 (file)
index 9aa2929..0000000
--- a/app-portage/eix/eix-0.23.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.23.2.ebuild,v 1.1 2011/10/21 21:01:36 darkside Exp $
-
-EAPI=4
-
-inherit multilib bash-completion-r1
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://eix.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug doc nls optimization security strong-optimization sqlite tools zsh-completion"
-
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-       nls? ( virtual/libintl )
-       zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils
-       nls? ( sys-devel/gettext )"
-
-src_configure() {
-       econf $(use_with sqlite) $(use_with doc extra-doc) \
-               $(use_with zsh-completion) \
-               $(use_enable nls) $(use_enable tools separate-tools) \
-               $(use_enable security) $(use_enable optimization) \
-               $(use_enable strong-optimization) $(use_enable debug debugging) \
-               $(use_with prefix always-accept-keywords) \
-               --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
-               --with-portage-rootpath="${ROOTPATH}" \
-               --with-eprefix-default="${EPREFIX}" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-       default
-       dobashcomp bash/eix
-}

diff --git a/app-portage/eix/eix-0.23.1.ebuild b/app-portage/eix/eix-0.23.3-r1.ebuild
similarity index 92%
rename from app-portage/eix/eix-0.23.1.ebuild
rename to app-portage/eix/eix-0.23.3-r1.ebuild
index 3504e7bdf47862546bee7ba5e606ee7a9e205904..495294051189e067daad7ca09c02577f3ed1e563 100644 (file)
--- a/app-portage/eix/eix-0.23.1.ebuild
+++ b/app-portage/eix/eix-0.23.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.23.1.ebuild,v 1.1 2011/09/13 16:37:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.23.3-r1.ebuild,v 1.1 2011/12/06 19:59:28 darkside Exp $
 
 EAPI=4
 
@@ -29,6 +29,7 @@ src_configure() {
                $(use_enable security) $(use_enable optimization) \
                $(use_enable strong-optimization) $(use_enable debug debugging) \
                $(use_with prefix always-accept-keywords) \
+               --without-bzip2 \
                --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
                --with-portage-rootpath="${ROOTPATH}" \
                --with-eprefix-default="${EPREFIX}" \

diff --git a/app-portage/eix/eix-0.23.3.ebuild b/app-portage/eix/eix-0.23.3.ebuild
deleted file mode 100644 (file)
index 78f2863..0000000
--- a/app-portage/eix/eix-0.23.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.23.3.ebuild,v 1.1 2011/11/06 21:00:52 darkside Exp $
-
-EAPI=4
-
-inherit multilib bash-completion-r1
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://eix.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug doc nls optimization security strong-optimization sqlite tools zsh-completion"
-
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-       nls? ( virtual/libintl )
-       zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils
-       nls? ( sys-devel/gettext )"
-
-src_configure() {
-       econf $(use_with sqlite) $(use_with doc extra-doc) \
-               $(use_with zsh-completion) \
-               $(use_enable nls) $(use_enable tools separate-tools) \
-               $(use_enable security) $(use_enable optimization) \
-               $(use_enable strong-optimization) $(use_enable debug debugging) \
-               $(use_with prefix always-accept-keywords) \
-               --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
-               --with-portage-rootpath="${ROOTPATH}" \
-               --with-eprefix-default="${EPREFIX}" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-       default
-       dobashcomp bash/eix
-}