remove intermediate version, cleanup changelog to show proper intentions

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 1f45f75e1e769d322ea5bc539efcfb3e1cb24930..8d70930acdd97f7227083a27a2d94b88d57e8b3b 100644 (file)
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,14 +1,10 @@
 # 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.377 2011/09/06 08:33:45 chainsaw Exp $
-
-  06 Sep 2011; Tony Vroon <chainsaw@gentoo.org> +eix-0.22.11.ebuild:
-  Reintroduce last stable, it appears to have been accidentally deleted. This
-  is based on a report by Nikoli in bug #379603 and by J.D. Horelick on IRC.
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.378 2011/09/06 12:43:58 darkside Exp $
 
 *eix-0.23.0 (05 Sep 2011)
 
-  05 Sep 2011; Jeremy Olexa <darkside@gentoo.org> -eix-0.22.11.ebuild,
+  05 Sep 2011; Jeremy Olexa <darkside@gentoo.org> -eix-0.22.10.ebuild,
   +eix-0.23.0.ebuild, metadata.xml:
   Version bump from upstream. Touch up USE flag descriptions, remove old
   version

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 85ef8fb1510ca5f8addcd45d33adfc78d1cf4293..a8b6ae6425697f6e3eef3d4375d4da5f8f502a7f 100644 (file)
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST eix-0.22.10.tar.xz 438580 RMD160 fd782f5d289abd8f050cf5c69914ecb7086c7807 SHA1 7df5a8755b9e09cbeb93e42a95e5a142af89e6b4 SHA256 2ee82d672d3e045a5986873716f46b94e40e5e4071d623c074766fe1b11b98c2
 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.0.tar.xz 439292 RMD160 8f8ace9542690cf6477c37f872dc44141c862003 SHA1 3e80cb9c6b914aaf663c644f1e70042c32eebecb SHA256 3cb926fe7c2477e6ccac98723f2a0206329abf4e38b529631e8de6591468a173
-EBUILD eix-0.22.10.ebuild 1657 RMD160 00d634612381018e6ff6f107cee117a465511a2b SHA1 6b929f4ff4e9a1d743ede6b3bd6b058295371d6d SHA256 1e9d0e551408249bc57fb35d521643215dc45df321f15a230262c554e053045d
 EBUILD eix-0.22.11.ebuild 1649 RMD160 fb585ec1850bab3f9416fb84430680c85df30b9d SHA1 dee604025adaea5a60c614dd8d80479baf12a441 SHA256 3bb046f654c2a951ec44aa574d3319f7691fc6ad7a9de50bfbf4b55dd892c58b
 EBUILD eix-0.22.5.ebuild 1608 RMD160 33dee63cca763aa3de48bc5c9fecd83a51ebbf2e SHA1 927a02c4b2d3eeb540095c3efb18da4d4c85f48b SHA256 a677780aec4d9201f1c188dd6c22adceb3529535304475cb5781baf0c2b9c598
 EBUILD eix-0.23.0.ebuild 1516 RMD160 71dedcfa2dc33d6f1c3d23f15cf2953053974622 SHA1 edeb6a5e0550104a490b2163215cb0725fb78aac SHA256 d96b4684b98cc8abbd90fe239666f66678e84e465d7bdb32afe936086bc55d63
-MISC ChangeLog 47277 RMD160 9b257eb33d00f882834ffd6e6231ffd897baaa25 SHA1 c3908cf442ff77249ebdbe415fdee25dccc41743 SHA256 652dcf724b87082a86db29dbb787ad1bd9a7f2183b5a89a8df264028edc873cc
+MISC ChangeLog 47052 RMD160 3b8c302442f3f3676b296a9b9889e4ab1550df04 SHA1 4372c408643c3a7dec2cd291da55c47329866022 SHA256 a10569974a97476f460e49e11ba875351b012d3f13b9842555465aa7594195b1
 MISC metadata.xml 2208 RMD160 036f64d607fc760683b96a103a84168878a82fc6 SHA1 287e24b8bfd54b4d663548a836926a55e8d0f5c0 SHA256 524310e4b6b0f64605acf45e55c50e8d6deea721f5f489b42faa55d4e2fda424
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk5l2vIACgkQp5vW4rUFj5oK1gCeOmCcDLxFxIaVHhG/tDNcBn53
-11wAnA+EtbN2K51FipxMS+XCzWB9HLJf
-=uRTb
------END PGP SIGNATURE-----

diff --git a/app-portage/eix/eix-0.22.10.ebuild b/app-portage/eix/eix-0.22.10.ebuild
deleted file mode 100644 (file)
index 4b55701..0000000
--- a/app-portage/eix/eix-0.22.10.ebuild
+++ /dev/null
@@ -1,38 +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.10.ebuild,v 1.1 2011/08/02 09:01:16 sping Exp $
-
-EAPI="4"
-
-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 zsh-completion"
-
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-       nls? ( virtual/libintl )
-       bzip2? ( app-arch/bzip2 )
-       zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils
-       nls? ( sys-devel/gettext )"
-
-src_configure() {
-       econf $(use_with bzip2) $(use_with sqlite) $(use_with doc extra-doc) \
-               $(use_with zsh-completion) \
-               $(use_enable nls) $(use_enable tools separate-tools) \
-               $(use_enable hardened 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"
-}