diff options
| -rw-r--r-- | app-portage/eix/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/eix/eix-0.15.4.ebuild | 50 | ||||
| -rw-r--r-- | app-portage/eix/eix-0.16.0.ebuild | 59 | ||||
| -rw-r--r-- | app-portage/eix/eix-0.16.2.ebuild | 62 | ||||
| -rw-r--r-- | app-portage/eix/eix-0.18.0.ebuild (renamed from app-portage/eix/eix-0.16.1.ebuild) | 50 | ||||
| -rw-r--r-- | app-portage/eix/files/eix-0.16.0-glibc-2.10.patch | 31 | ||||
| -rw-r--r-- | app-portage/eix/metadata.xml | 2 |
7 files changed, 41 insertions, 222 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog index 9d6569ae2c94..9888f35599a2 100644 --- a/app-portage/eix/ChangeLog +++ b/app-portage/eix/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/eix # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.304 2009/09/12 17:42:34 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.305 2009/09/20 03:07:00 darkside Exp $ + +*eix-0.18.0 (20 Sep 2009) + + 20 Sep 2009; Jeremy Olexa <darkside@gentoo.org> -eix-0.15.4.ebuild, + -eix-0.16.0.ebuild, -files/eix-0.16.0-glibc-2.10.patch, + -eix-0.16.1.ebuild, -eix-0.16.2.ebuild, +eix-0.18.0.ebuild, metadata.xml: + Version bump, much for flexible 'format' language - xml output if desired 12 Sep 2009; Raúl Porcel <armin76@gentoo.org> eix-0.17.0.ebuild: arm/ia64/s390/sh stable wrt #282379 diff --git a/app-portage/eix/eix-0.15.4.ebuild b/app-portage/eix/eix-0.15.4.ebuild deleted file mode 100644 index 66800bbc7af1..000000000000 --- a/app-portage/eix/eix-0.15.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.15.4.ebuild,v 1.9 2009/03/24 20:37:39 ranger Exp $ - -inherit multilib - -DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. -overlays, version changes, and more" -HOMEPAGE="http://eix.sourceforge.net" -SRC_URI="mirror://sourceforge/eix/${P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="doc sqlite" - -RDEPEND="sqlite? ( >=dev-db/sqlite-3 ) - app-arch/bzip2" -DEPEND="${RDEPEND} - app-arch/lzma-utils - doc? ( dev-python/docutils )" - -src_compile() { - econf --with-bzip2 $(use_with sqlite) $(use_with doc rst) \ - --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ - --with-portage-rootpath="${ROOTPATH}" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog doc/format.txt - use doc && dodoc doc/format.html -} - -pkg_postinst() { - ewarn - ewarn "Security Warning:" - ewarn - ewarn "Since >=eix-0.12.0, eix uses by default OVERLAY_CACHE_METHOD=\"parse|ebuild*\"" - ewarn "This is rather reliable, but ebuilds may be executed by user \"portage\". Set" - ewarn "OVERLAY_CACHE_METHOD=parse in /etc/eixrc if you do not trust the ebuilds." - if test -d /var/log && ! test -x /var/log || test -e /var/log/eix-sync.log - then - einfo - einfo "eix-sync no longer supports redirection to /var/log/eix-sync.log" - einfo "You can remove that file." - fi -} diff --git a/app-portage/eix/eix-0.16.0.ebuild b/app-portage/eix/eix-0.16.0.ebuild deleted file mode 100644 index 803a5e433ce6..000000000000 --- a/app-portage/eix/eix-0.16.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.16.0.ebuild,v 1.9 2009/07/19 14:36:52 nixnut Exp $ - -inherit multilib eutils - -DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. -overlays, version changes, and more" -HOMEPAGE="http://eix.sourceforge.net" -SRC_URI="mirror://sourceforge/eix/${P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="doc nls sqlite tools" - -RDEPEND="sqlite? ( >=dev-db/sqlite-3 ) - nls? ( virtual/libintl ) - app-arch/bzip2" -DEPEND="${RDEPEND} - app-arch/lzma-utils - doc? ( dev-python/docutils ) - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-0.16.0-glibc-2.10.patch" -} - -src_compile() { - econf --with-bzip2 $(use_with sqlite) $(use_with doc rst) \ - $(use_enable nls) $(use_enable tools separate-tools) \ - --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ - --with-portage-rootpath="${ROOTPATH}" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog doc/format.txt - use doc && dodoc doc/format.html -} - -pkg_postinst() { - ewarn - ewarn "Security Warning:" - ewarn - ewarn "Since >=eix-0.12.0, eix uses by default OVERLAY_CACHE_METHOD=\"parse|ebuild*\"" - ewarn "This is rather reliable, but ebuilds may be executed by user \"portage\". Set" - ewarn "OVERLAY_CACHE_METHOD=parse in /etc/eixrc if you do not trust the ebuilds." - if test -d /var/log && ! test -x /var/log || test -e /var/log/eix-sync.log - then - einfo - einfo "eix-sync no longer supports redirection to /var/log/eix-sync.log" - einfo "You can remove that file." - fi -} diff --git a/app-portage/eix/eix-0.16.2.ebuild b/app-portage/eix/eix-0.16.2.ebuild deleted file mode 100644 index 9d97bbc45caf..000000000000 --- a/app-portage/eix/eix-0.16.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.16.2.ebuild,v 1.1 2009/06/26 12:50:00 darkside Exp $ - -inherit multilib - -DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. -overlays, version changes, and more" -HOMEPAGE="http://eix.sourceforge.net" -SRC_URI="mirror://sourceforge/eix/${P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="doc nls sqlite tools" - -RDEPEND="sqlite? ( >=dev-db/sqlite-3 ) - nls? ( virtual/libintl ) - app-arch/bzip2" -DEPEND="${RDEPEND} - app-arch/lzma-utils - doc? ( dev-python/docutils ) - nls? ( sys-devel/gettext )" - -src_compile() { - econf --with-bzip2 $(use_with sqlite) $(use_with doc rst) \ - $(use_enable nls) $(use_enable tools separate-tools) \ - --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ - --with-portage-rootpath="${ROOTPATH}" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog doc/format.txt - use doc && dodoc doc/format.html -} - -pkg_postinst() { - elog "Ask your overlay maintainers to provide metadata or consider to run" - elog " egencache --repo=foo --update" - elog "after updates (e.g. in /etc/eix-sync)." - elog "This will speed up portage and update-eix (when the new default cache method" - elog "\"...#metadata-flat\" is used and file dates are correct) for those overlays." - elog "If metadata is provided but file dates are mangled during overlay updates," - elog "you may switch to cache method \"metadata-flat\" instead for that overlay:" - elog "This is even faster, but works only if metadata is actually up-to-date." - ewarn - ewarn "Security Warning:" - ewarn - ewarn "Since >=eix-0.12.0, eix uses by default OVERLAY_CACHE_METHOD=\"parse|ebuild*\"" - ewarn "(since >=eix-0.16.1 with automagic \"#metadata-flat\")." - ewarn "This is rather reliable, but ebuilds may be executed by user \"portage\". Set" - ewarn "OVERLAY_CACHE_METHOD=parse in /etc/eixrc if you do not trust the ebuilds." - if test -d /var/log && ! test -x /var/log || test -e /var/log/eix-sync.log - then - einfo - einfo "eix-sync no longer supports redirection to /var/log/eix-sync.log" - einfo "You can remove that file." - fi -} diff --git a/app-portage/eix/eix-0.16.1.ebuild b/app-portage/eix/eix-0.18.0.ebuild index ff526ce566a0..58fdd73cc130 100644 --- a/app-portage/eix/eix-0.16.1.ebuild +++ b/app-portage/eix/eix-0.18.0.ebuild @@ -1,33 +1,45 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.16.1.ebuild,v 1.1 2009/06/09 20:29:03 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.18.0.ebuild,v 1.1 2009/09/20 03:07:00 darkside Exp $ + +EAPI="2" inherit multilib -DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. -overlays, version changes, and more" +DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more" HOMEPAGE="http://eix.sourceforge.net" -SRC_URI="mirror://sourceforge/eix/${P}.tar.lzma" +SRC_URI="mirror://sourceforge/eix/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="doc nls sqlite tools" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="+bzip2 deprecated doc nls sqlite tools" RDEPEND="sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) - app-arch/bzip2" + bzip2? ( app-arch/bzip2 )" DEPEND="${RDEPEND} - app-arch/lzma-utils + app-arch/xz-utils doc? ( dev-python/docutils ) nls? ( sys-devel/gettext )" -src_compile() { - econf --with-bzip2 $(use_with sqlite) $(use_with doc rst) \ +src_unpack() { + local i s + for i in ${A} + do + s="${DISTDIR%/}/${i}" + einfo "Unpacking ${s} to ${PWD}" + test -s "${s}" || die "${s} does not exist" + xz -dc -- "${s}" | tar xof - || die "Unpacking ${s} failed" + done +} + +src_configure() { + econf $(use_with bzip2) $(use_with sqlite) $(use_with doc rst) \ $(use_enable nls) $(use_enable tools separate-tools) \ --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ - --with-portage-rootpath="${ROOTPATH}" - emake || die "emake failed" + --with-portage-rootpath="${ROOTPATH}" \ + $(use_enable deprecated obsolete-reminder) } src_install() { @@ -41,7 +53,7 @@ pkg_postinst() { elog "Ask your overlay maintainers to provide metadata or consider to run" elog " egencache --repo=foo --update" elog "after updates (e.g. in /etc/eix-sync)." - elog "This will speed up portage and update-eix (when the new default cache method" + elog "This will speed up portage and eix-update (when the new default cache method" elog "\"...#metadata-flat\" is used and file dates are correct) for those overlays." elog "If metadata is provided but file dates are mangled during overlay updates," elog "you may switch to cache method \"metadata-flat\" instead for that overlay:" @@ -53,10 +65,12 @@ pkg_postinst() { ewarn "(since >=eix-0.16.1 with automagic \"#metadata-flat\")." ewarn "This is rather reliable, but ebuilds may be executed by user \"portage\". Set" ewarn "OVERLAY_CACHE_METHOD=parse in /etc/eixrc if you do not trust the ebuilds." - if test -d /var/log && ! test -x /var/log || test -e /var/log/eix-sync.log - then - einfo - einfo "eix-sync no longer supports redirection to /var/log/eix-sync.log" - einfo "You can remove that file." + if use deprecated; then + elog "ATTENTION: The old eix executable names will be going away soon" + elog "Update your scripts" + else + elog "ATTENTION: The eix executable names have changed. Update your" + elog "scripts, if needed. This message will go away soon." fi + } diff --git a/app-portage/eix/files/eix-0.16.0-glibc-2.10.patch b/app-portage/eix/files/eix-0.16.0-glibc-2.10.patch deleted file mode 100644 index 24d6c7e2fbc6..000000000000 --- a/app-portage/eix/files/eix-0.16.0-glibc-2.10.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/eixTk/ptr_list.h -+++ src/eixTk/ptr_list.h -@@ -47,7 +47,7 @@ - /// A list that only stores pointers to type. - template<typename type> - class ptr_list -- : virtual public std::list<type*> -+ : public std::list<type*> - { - public: - using std::list<type*>::begin; ---- src/output/formatstring.cc -+++ src/output/formatstring.cc -@@ -278,7 +278,7 @@ - FormatParser::ParserState - FormatParser::state_COLOR() - { -- char *q = strchr(band_position, ')'); -+ const char *q = strchr(band_position, ')'); - if(q == NULL) { - last_error = _("'(' without closing ')'"); - return ERROR; -@@ -299,7 +299,7 @@ - FormatParser::ParserState - FormatParser::state_PROPERTY() - { -- char *q = strchr(band_position, '>'); -+ const char *q = strchr(band_position, '>'); - if(q == NULL) { - last_error = _("'<' without closing '>'"); - return ERROR; diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml index 10881363bafa..b7deff3dcb52 100644 --- a/app-portage/eix/metadata.xml +++ b/app-portage/eix/metadata.xml @@ -14,7 +14,7 @@ </maintainer> <use> <flag name="bzip2">Support for parsing of environment.bz2 to guess repository name of packages installed with ancient portage versions (requires <pkg>app-arch/bbzip2</pkg>). This flag is safe to disable for portage users that have re-merged all packages since 2007. This flag will be phased out.</flag> - <flag name="deprecated">Installs wrapper scripts for all the previous executable names that will soon be going away</flag> + <flag name="deprecated">Installs wrapper scripts for all the previous executable names that will soon be going away. Enabled by default in 0.17.0, optional in 0.18.0, removed in next major release.</flag> <flag name="doc">Create description of the eix cache file additionally in html format</flag> <flag name="nls">Support foreign language messages (experimental; currently only de)</flag> <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag> |