commit: 8cb569224795d43031b72ccff1a7deff65865a88
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 16:36:53 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 17:10:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb56922
app-portage/repoman: sync live ebuild
Package-Manager: Portage-2.3.3_p7, Repoman-2.3.1
app-portage/repoman/repoman-2.3.1.ebuild | 11 +++++-
app-portage/repoman/repoman-9999.ebuild | 63 +++++++++++---------------------
2 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/app-portage/repoman/repoman-2.3.1.ebuild
b/app-portage/repoman/repoman-2.3.1.ebuild
index 8ec8376..0bc1338 100644
--- a/app-portage/repoman/repoman-2.3.1.ebuild
+++ b/app-portage/repoman/repoman-2.3.1.ebuild
@@ -9,13 +9,20 @@ PYTHON_REQ_USE='bzip2(+)'
inherit distutils-r1
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git";
+ S="${WORKDIR}/${P}/repoman"
+else
+ SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2";
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/app-portage/repoman/repoman-9999.ebuild
b/app-portage/repoman/repoman-9999.ebuild
index 5a46475..0bc1338 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -2,62 +2,47 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(
- python3_3 python3_4 python3_5
- python2_7
-)
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE='bzip2(+)'
-inherit distutils-r1 git-r3 multilib
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git";
+ S="${WORKDIR}/${P}/repoman"
+else
+ SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2";
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="0"
IUSE=""
-DEPEND="
- dev-lang/python-exec:2
- =sys-apps/portage-9999
- "
-
RDEPEND="
- dev-lang/python-exec:2
- =sys-apps/portage-9999[${PYTHON_USEDEP}]
+ >=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
- "
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman";
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git
- https://github.com/gentoo/portage.git";
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI=""
-
-S="${WORKDIR}/${P}/repoman"
+"
+DEPEND="${RDEPEND}"
python_prepare_all() {
distutils-r1_python_prepare_all
- if [[ -n ${EPREFIX} ]] ; then
+ if [[ -n "${EPREFIX}" ]] ; then
einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
+
+ local file
+ while read -r -d $'\0' file; do
+ local shebang=$(head -n1 "${file}")
+
if [[ ${shebang} == "#!"* && ! ${shebang} ==
"#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:"
"$REPLY" || \
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:"
"${file}" || \
die "sed failed"
fi
done < <(find . -type f -print0)
@@ -81,10 +66,6 @@ python_install() {
"${@}"
}
-python_install_all() {
- distutils-r1_python_install_all
-}
-
pkg_postinst() {
einfo ""
einfo "This release of repoman is from the new portage/repoman split"
