[gentoo-commits] proj/sci:master commit in: app-admin/eselect/, app-admin/eselect/files/
commit: c86fdf3185ceba586750afebd47360a7d0cb0256 Author: Aisha Tammy aisha cc> AuthorDate: Fri Sep 25 21:59:08 2020 + Commit: Aisha Tammy aisha cc> CommitDate: Fri Sep 25 21:59:08 2020 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c86fdf31 app-admin/eselect: drop package present in ::gentoo Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Aisha Tammy aisha.cc> app-admin/eselect/eselect-1.4.13-r101.ebuild | 73 - app-admin/eselect/eselect-.ebuild | 71 - .../files/eselect-1.4.13-alternatives.patch| 1603 app-admin/eselect/metadata.xml |7 - 4 files changed, 1754 deletions(-) diff --git a/app-admin/eselect/eselect-1.4.13-r101.ebuild b/app-admin/eselect/eselect-1.4.13-r101.ebuild deleted file mode 100644 index 602a3c8e8..0 --- a/app-admin/eselect/eselect-1.4.13-r101.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils bash-completion-r1 - -DESCRIPTION="Gentoo's multi-purpose configuration and management tool" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"; -SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"; - -LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc emacs vim-syntax" - -RDEPEND=" - !app-eselect/eselect-blas - !app-eselect/eselect-lapack - || ( - sys-apps/coreutils - sys-freebsd/freebsd-bin - app-misc/realpath - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - doc? ( dev-python/docutils )" -RDEPEND="!app-admin/eselect-news - ${RDEPEND} - sys-apps/file - sys-libs/ncurses" - -PDEPEND="emacs? ( app-emacs/eselect-mode ) - vim-syntax? ( app-vim/eselect-syntax )" - -PATCHES=( "${FILESDIR}"/${P}-alternatives.patch ) - -src_prepare() { - default - AT_M4DIR="." eautoreconf -} - -src_compile() { - default - use doc && emake html -} - -src_install() { - default - newbashcomp misc/${PN}.bashcomp ${PN} - dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt - use doc && dohtml *.html doc/* - - # needed by news module - keepdir /var/lib/gentoo/news - if use prefix; then - sed -i \ - "s:ALTERNATIVESDIR_ROOTLESS=\"${EPREFIX}:ALTERNATIVESDIR_ROOTLESS=\":" \ - "${ED}"/usr/share/eselect/libs/alternatives-common.bash || die - else - fowners root:portage /var/lib/gentoo/news - fperms g+w /var/lib/gentoo/news - fi -} - -pkg_postinst() { - # fowners in src_install doesn't work for the portage group: - # merging changes the group back to root - if ! use prefix; then - chgrp portage "${EROOT}/var/lib/gentoo/news" \ - && chmod g+w "${EROOT}/var/lib/gentoo/news" - fi -} diff --git a/app-admin/eselect/eselect-.ebuild b/app-admin/eselect/eselect-.ebuild deleted file mode 100644 index 8cae96147..0 --- a/app-admin/eselect/eselect-.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools git-r3 bash-completion-r1 - -DESCRIPTION="Gentoo's multi-purpose configuration and management tool" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"; -EGIT_REPO_URI="git://github.com/gentoo-science/eselect.git" -EGIT_BRANCH="alternatives" - -LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )" -SLOT="0" -IUSE="doc emacs vim-syntax" - -RDEPEND=" - !app-eselect/eselect-blas - !app-eselect/eselect-lapack - || ( - sys-apps/coreutils - sys-freebsd/freebsd-bin - app-misc/realpath - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - doc? ( dev-python/docutils )" -RDEPEND="!app-admin/eselect-news - ${RDEPEND} - sys-apps/file - sys-libs/ncurses" - -PDEPEND="emacs? ( app-emacs/eselect-mode ) - vim-syntax? ( app-vim/eselect-syntax )" - -src_prepare() { - default - AT_M4DIR="." eautoreconf -} - -src_compile() { - default - use doc && emake html -} - -src_install() { - default - newbashcomp misc/${PN}.bashcomp ${PN} - dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt - use doc && dohtml *.html doc/* - - # needed by news module - keepdir /var/lib/gentoo/news - if use prefix; then - sed -i \ - "s:ALTERNATIVESDIR_ROOTLESS=\"${EPREFIX}:ALTERNATIVESDIR_ROOTLESS=\":" \ - "${ED}"/usr/share/eselect/libs/alternatives-common.bash || die - else - fowners root:portage /var/lib/gentoo/news - fperms g+w /var/lib/
[gentoo-commits] proj/sci:master commit in: app-admin/eselect/, app-admin/eselect/files/, eclass/
commit: 9674d94501b1fab37292f4a7fcbc99102f121392 Author: François Bissey gmail com> AuthorDate: Wed Jun 20 23:02:52 2018 + Commit: Christoph Junghans gentoo org> CommitDate: Thu Jun 21 13:03:59 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9674d945 app-admin/eselect: Fix alternatives patch Package-Manager: Portage-2.3.40, Repoman-2.3.9 Signed-off-by: Christoph Junghans gentoo.org> Closes: https://github.com/gentoo/sci/pull/871 ...4.13-r100.ebuild => eselect-1.4.13-r101.ebuild} | 0 .../files/eselect-1.4.13-alternatives.patch| 210 +++-- eclass/alternatives-2.eclass | 2 +- 3 files changed, 107 insertions(+), 105 deletions(-) diff --git a/app-admin/eselect/eselect-1.4.13-r100.ebuild b/app-admin/eselect/eselect-1.4.13-r101.ebuild similarity index 100% rename from app-admin/eselect/eselect-1.4.13-r100.ebuild rename to app-admin/eselect/eselect-1.4.13-r101.ebuild diff --git a/app-admin/eselect/files/eselect-1.4.13-alternatives.patch b/app-admin/eselect/files/eselect-1.4.13-alternatives.patch index 4e7455e6d..0dbc50ef7 100644 --- a/app-admin/eselect/files/eselect-1.4.13-alternatives.patch +++ b/app-admin/eselect/files/eselect-1.4.13-alternatives.patch @@ -1,12 +1,15 @@ bin/Makefile.am | 1 + bin/eselect.in | 150 +++- libs/Makefile.am | 7 +- - libs/alternatives-common.bash.in | 509 +++ + libs/alternatives-common.bash.in | 510 +++ libs/alternatives.bash.in| 316 modules/Makefile.am | 1 + modules/alternatives.eselect | 178 ++ - modules/modules.eselect | 288 ++ - 8 files changed, 1342 insertions(+), 108 deletions(-) + modules/modules.eselect | 282 ++ + 8 files changed, 1340 insertions(+), 105 deletions(-) + create mode 100644 libs/alternatives-common.bash.in + create mode 100644 libs/alternatives.bash.in + create mode 100644 modules/alternatives.eselect diff --git a/bin/Makefile.am b/bin/Makefile.am index 20902c1..ad08867 100644 @@ -251,10 +254,10 @@ index 6ebd08e..c19f173 100644 @$(dosed) $< > $@ diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in new file mode 100644 -index 000..024d41e +index 000..79b6eb5 --- /dev/null +++ b/libs/alternatives-common.bash.in -@@ -0,0 +1,509 @@ +@@ -0,0 +1,510 @@ +# Copyright (c) 2005-2015 Gentoo Foundation +# Copyright (c) 2008 Mike Kelly +# Copyright (c) 2009-2013 David Leverton @@ -277,7 +280,8 @@ index 000..024d41e +inherit config output path-manipulation tests + +: "${ALTERNATIVESDIR_ROOTLESS:=@sysconfdir@/env.d/alternatives}" -+ALTERNATIVESDIR="${EROOT%/}${ALTERNATIVESDIR_ROOTLESS}" ++: "${ALTERNATIVESDIR_ROOT:=${EROOT%/}}" ++ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOT}${ALTERNATIVESDIR_ROOTLESS}" + +get_current_provider() { + local dieprefix="Could not determine current provider for ${ALTERNATIVE}" @@ -467,7 +471,7 @@ index 000..024d41e + old_i+=1 + + else -+ local target=${ALTERNATIVESDIR_ROOTLESS#/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} ++ local target=${ALTERNATIVESDIR_ROOTLESS#${EPREFIX}/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} + while [[ -n ${dir} ]]; do + target=../${target} + dir=${dir%/*} @@ -563,7 +567,7 @@ index 000..024d41e + if [[ ${src} != /* ]]; then + die "Source path must be absolute, but got ${src}" + else -+ local reltarget= dir=${provider_dir}${src%/*} ++ local reltarget= dir=${provider_dir#${ALTERNATIVESDIR_ROOT}${EPREFIX}}${src%/*} + while [[ -n ${dir} ]]; do + reltarget+=../ + dir=${dir%/*} @@ -1307,49 +1311,6 @@ index 5bc78ca..23c1e59 100644 do_list() { - local only_names path file module name desc - local -a extra_modules -- -- if [[ ${1#--} = only-names ]]; then -- only_names=1 -- shift -- fi -- [[ $# -gt 0 ]] && die -q "Too many parameters" -- -- for path in "${ESELECT_MODULES_PATH[@]}" ; do -- [[ -d ${path} ]] || continue -- for file in "${path}"/*.eselect ; do -- [[ -f ${file} ]] || continue -- extra_modules=( "${extra_modules[@]}" "${file}" ) -- done -- done -- -- if [[ -n ${only_names} ]]; then -- # This is mainly intended for bash completion -- echo "help" --
[gentoo-commits] proj/sci:master commit in: app-admin/eselect/, app-admin/eselect/files/
commit: 6445144178aa9c9c2b355ae83d5ed51b6d558b8e Author: Justin Lecher gentoo org> AuthorDate: Thu Dec 3 07:41:35 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Dec 3 07:41:35 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=64451441 app-admin/eselect: Update to latest alternatives patch Github: closes gentoo-science/sci#453 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> ...select-1.4.5-r102.ebuild => eselect-1.4.5-r103.ebuild} | 0 app-admin/eselect/files/eselect-1.4.5-alternatives.patch | 15 --- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app-admin/eselect/eselect-1.4.5-r102.ebuild b/app-admin/eselect/eselect-1.4.5-r103.ebuild similarity index 100% rename from app-admin/eselect/eselect-1.4.5-r102.ebuild rename to app-admin/eselect/eselect-1.4.5-r103.ebuild diff --git a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch index 8296aa1..699f17b 100644 --- a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch +++ b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch @@ -1,12 +1,12 @@ bin/Makefile.am | 1 + bin/eselect.in | 150 +++- libs/Makefile.am | 7 +- - libs/alternatives-common.bash.in | 509 +++ + libs/alternatives-common.bash.in | 510 +++ libs/alternatives.bash.in| 316 modules/Makefile.am | 1 + modules/alternatives.eselect | 178 ++ modules/modules.eselect | 288 ++ - 8 files changed, 1342 insertions(+), 108 deletions(-) + 8 files changed, 1343 insertions(+), 108 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 20902c1..ad08867 100644 @@ -251,10 +251,10 @@ index 027ef73..a5fe373 100644 @$(dosed) $< > $@ diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in new file mode 100644 -index 000..024d41e +index 000..10d6616 --- /dev/null +++ b/libs/alternatives-common.bash.in -@@ -0,0 +1,509 @@ +@@ -0,0 +1,510 @@ +# Copyright (c) 2005-2015 Gentoo Foundation +# Copyright (c) 2008 Mike Kelly +# Copyright (c) 2009-2013 David Leverton @@ -277,7 +277,8 @@ index 000..024d41e +inherit config output path-manipulation tests + +: "${ALTERNATIVESDIR_ROOTLESS:=@sysconfdir@/env.d/alternatives}" -+ALTERNATIVESDIR="${EROOT%/}${ALTERNATIVESDIR_ROOTLESS}" ++: "${ALTERNATIVESDIR_ROOT:=${ROOT%/}}" ++ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOT}${ALTERNATIVESDIR_ROOTLESS}" + +get_current_provider() { + local dieprefix="Could not determine current provider for ${ALTERNATIVE}" @@ -467,7 +468,7 @@ index 000..024d41e + old_i+=1 + + else -+ local target=${ALTERNATIVESDIR_ROOTLESS#/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} ++ local target=${ALTERNATIVESDIR_ROOTLESS#${EPREFIX}/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} + while [[ -n ${dir} ]]; do + target=../${target} + dir=${dir%/*} @@ -563,7 +564,7 @@ index 000..024d41e + if [[ ${src} != /* ]]; then + die "Source path must be absolute, but got ${src}" + else -+ local reltarget= dir=${provider_dir}${src%/*} ++ local reltarget= dir=${provider_dir#${ALTERNATIVESDIR_ROOT}${EPREFIX}}${src%/*} + while [[ -n ${dir} ]]; do + reltarget+=../ + dir=${dir%/*}
[gentoo-commits] proj/sci:master commit in: app-admin/eselect/, app-admin/eselect/files/
commit: 55a8e55d79f9e3122b95ac9b127cee218363d201 Author: Justin Lecher gentoo org> AuthorDate: Fri Aug 14 07:20:29 2015 + Commit: Justin Lecher gentoo org> CommitDate: Fri Aug 14 07:20:29 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=55a8e55d app-admin/eselect: Version Bump Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher gentoo.org> app-admin/eselect/ChangeLog| 7 +++ .../{eselect-1.4.4-r102.ebuild => eselect-1.4.5-r100.ebuild} | 0 ...t-1.4.4-alternatives.patch => eselect-1.4.5-alternatives.patch} | 0 3 files changed, 7 insertions(+) diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 79d1aac..d3c8e3e 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.179 2011/01/22 21:38:52 ulm Exp $ +*eselect-1.4.5-r100 (14 Aug 2015) + + 14 Aug 2015; Justin Lecher +eselect-1.4.5-r100.ebuild, + +files/eselect-1.4.5-alternatives.patch, -eselect-1.4.4-r102.ebuild, + -files/eselect-1.4.4-alternatives.patch: + app-admin/eselect: Version Bump + *eselect-1.4.4-r102 (06 Jun 2015) 06 Jun 2015; Justin Lecher +eselect-1.4.4-r102.ebuild, diff --git a/app-admin/eselect/eselect-1.4.4-r102.ebuild b/app-admin/eselect/eselect-1.4.5-r100.ebuild similarity index 100% rename from app-admin/eselect/eselect-1.4.4-r102.ebuild rename to app-admin/eselect/eselect-1.4.5-r100.ebuild diff --git a/app-admin/eselect/files/eselect-1.4.4-alternatives.patch b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch similarity index 100% rename from app-admin/eselect/files/eselect-1.4.4-alternatives.patch rename to app-admin/eselect/files/eselect-1.4.5-alternatives.patch
[gentoo-commits] proj/sci:master commit in: app-admin/eselect/, app-admin/eselect/files/
commit: 0c228168dd58e43fe32a14aa3b346e91521d0a95 Author: Justin Lecher gentoo org> AuthorDate: Thu Apr 2 10:20:04 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Apr 2 10:20:04 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0c228168 app-admin/eselect: Drop old Package-Manager: portage-2.2.18 app-admin/eselect/ChangeLog| 7 + app-admin/eselect/eselect-1.3.7-r100.ebuild| 72 --- app-admin/eselect/eselect-1.3.8-r100.ebuild| 72 --- app-admin/eselect/eselect-1.4-r100.ebuild | 72 --- app-admin/eselect/eselect-1.4.1-r100.ebuild| 72 --- app-admin/eselect/eselect-1.4.2-r100.ebuild| 72 --- app-admin/eselect/eselect-1.4.3-r100.ebuild| 72 --- .../eselect/files/eselect-1.3.8-alternatives.patch | 616 app-admin/eselect/files/eselect-alternatives.patch | 618 - 9 files changed, 7 insertions(+), 1666 deletions(-) diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 29de45c..cc795da 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.179 2011/01/22 21:38:52 ulm Exp $ + 02 Apr 2015; Justin Lecher -eselect-1.3.7-r100.ebuild, + -eselect-1.3.8-r100.ebuild, -eselect-1.4-r100.ebuild, + -eselect-1.4.1-r100.ebuild, -eselect-1.4.2-r100.ebuild, + -eselect-1.4.3-r100.ebuild, -files/eselect-1.3.8-alternatives.patch, + -files/eselect-alternatives.patch: + app-admin/eselect: Drop old + *eselect-1.4.4-r100 (26 Jan 2015) 26 Jan 2015; Justin Lecher +eselect-1.4.4-r100.ebuild: diff --git a/app-admin/eselect/eselect-1.3.7-r100.ebuild b/app-admin/eselect/eselect-1.3.7-r100.ebuild deleted file mode 100644 index 6be2133..000 --- a/app-admin/eselect/eselect-1.3.7-r100.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils bash-completion-r1 - -DESCRIPTION="Gentoo's multi-purpose configuration and management tool" -HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Eselect"; -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs vim-syntax" - -RDEPEND="sys-apps/sed - || ( - sys-apps/coreutils - sys-freebsd/freebsd-bin - app-misc/realpath - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - doc? ( dev-python/docutils )" -RDEPEND="!app-admin/eselect-news - ${RDEPEND} - sys-apps/file - sys-libs/ncurses" - -PDEPEND="emacs? ( app-emacs/eselect-mode ) - vim-syntax? ( app-vim/eselect-syntax )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-alternatives.patch - AT_M4DIR="." eautoreconf -} - -src_compile() { - emake - use doc && emake html -} - -src_install() { - emake DESTDIR="${D}" install - newbashcomp misc/${PN}.bashcomp ${PN} - dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt - use doc && dohtml *.html doc/* - - # needed by news module - keepdir /var/lib/gentoo/news - if ! use prefix; then - fowners root:portage /var/lib/gentoo/news - fperms g+w /var/lib/gentoo/news - fi - - # band aid for prefix - if use prefix; then - cd "${ED}"/usr/share/eselect/libs - sed -i "s:ALTERNATIVESDIR_ROOTLESS=\"${EPREFIX}:ALTERNATIVESDIR_ROOTLESS=\":" alternatives.bash || die - fi -} - -pkg_postinst() { - # fowners in src_install doesn't work for the portage group: - # merging changes the group back to root - if ! use prefix; then - chgrp portage "${EROOT}/var/lib/gentoo/news" \ - && chmod g+w "${EROOT}/var/lib/gentoo/news" - fi -} diff --git a/app-admin/eselect/eselect-1.3.8-r100.ebuild b/app-admin/eselect/eselect-1.3.8-r100.ebuild deleted file mode 100644 index 700374b..000 --- a/app-admin/eselect/eselect-1.3.8-r100.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools eutils bash-completion-r1 - -DESCRIPTION="Gentoo's multi-purpose configuration and management tool" -HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Eselect"; -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2+ || ( GPL-2+ CC-BY-