public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gentoo-guis:master commit in: sys-apps/portage/
@ 2011-05-27  5:15 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2011-05-27  5:15 UTC (permalink / raw
  To: gentoo-commits

commit:     6b08239f24c4bed3ad16074fe925b84ed9175b76
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Fri May 27 05:11:17 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri May 27 05:14:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=6b08239f

update portage-8888 to match latest -9999 changes

---
 sys-apps/portage/ChangeLog           |    5 ++-
 sys-apps/portage/Manifest            |    2 +-
 sys-apps/portage/portage-8888.ebuild |   69 ++++++++++++++++++++++++---------
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 74146ea..40bd0fe 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sys-apps/portage
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header:                                                                                                   Exp $
 
+  27 May 2011; Brian Dolbec <brian.dolbec@gmail.com> portage-8888.ebuild:
+  update portage-8888.ebuild to the latest-9999.ebuild changes
+
 *portage-8888 (1 Aug 2010)
 
   1 Aug 2010; Brian Dolbec <brian.dolbec@gmail.com>  +portage-8888.ebuild:

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3b1de4d..c809263 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-8888.ebuild 10134 RMD160 8e36eafa87b3fe53e2c0acec747dc110ac843c33 SHA1 ec90ed8f5761941b34719dd437ee7c8c8a8659fc SHA256 0fe72b5671b435dcf564a7e8acfc60f6e81ef4ea2e4418aa4f33630d07e1168a
+EBUILD portage-8888.ebuild 11281 RMD160 2ea90c35486dde626a75d61adb4da28c53beadfb SHA1 349ab4574244bf0c4e63b596fc4f19c269215638 SHA256 d4a57fe4d78e69b4b4c029172052f29eb67d5f3e0b9adcec1d7aee8219fface4
 MISC ChangeLog 407 RMD160 7131f6d313087dd7a29f45f83c128c25decb7444 SHA1 27796a8cce236f8150c90385708bb0c182325880 SHA256 108009e9e1e3345d0d3e0d905d129d0af95dc3bfa840ed41b59372b2879b2657

diff --git a/sys-apps/portage/portage-8888.ebuild b/sys-apps/portage/portage-8888.ebuild
index 6348aac..82173c4 100644
--- a/sys-apps/portage/portage-8888.ebuild
+++ b/sys-apps/portage/portage-8888.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.4 2010/04/28 07:26:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-8888.ebuild,v 1.23 2011/05/26  dol-sen Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
 EAPI=2
 EGIT_BRANCH="public_api"
-inherit git eutils multilib python
+inherit git-2 eutils multilib python
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -14,10 +14,14 @@ LICENSE="GPL-2"
 KEYWORDS=""
 PROVIDE="virtual/portage"
 SLOT="0"
-IUSE="build doc epydoc python3 selinux"
+IUSE="build doc epydoc +ipc python2 python3 selinux"
 
 python_dep="python3? ( =dev-lang/python-3* )
-	!python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
+	!python2? ( !python3? (
+		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
+		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
+	) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
@@ -33,7 +37,8 @@ RDEPEND="${python_dep}
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
-	selinux? ( sys-libs/libselinux )"
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -61,7 +66,15 @@ compatible_python_is_selected() {
 }
 
 pkg_setup() {
-	if ! use python3 && ! compatible_python_is_selected ; then
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
 		ewarn "Attempting to select a compatible default python interpreter"
 		local x success=0
 		for x in /usr/bin/python2.* ; do
@@ -83,17 +96,35 @@ pkg_setup() {
 
 	if use python3; then
 		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
 	fi
 }
 
 src_prepare() {
-	local _version="'$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')'[1:]"
+	local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
+	_version=${_version:1}
 	einfo "Setting portage.VERSION to ${_version} ..."
-	sed -i "s/^VERSION=.*/VERSION=${_version}/" pym/portage/__init__.py || \
+	sed -e "s/^VERSION=.*/VERSION='${_version}'/" -i pym/portage/__init__.py || \
 		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${_version}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
 
 	if use python3; then
+		einfo "Converting shebangs for python3..."
 		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
 	fi
 }
 
@@ -123,10 +154,7 @@ src_compile() {
 }
 
 src_test() {
-	PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-		./pym/portage/tests/runTests || die "test(s) failed"
-	# Prevent installation of *.pyc for python scripts.
-	find "$S/bin" -name "*.py[co]" -print0 | xargs -0 rm
+	./runtests.sh || die "tests failed"
 }
 
 src_install() {
@@ -164,14 +192,16 @@ src_install() {
 		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
 	fi
 
-	local x symlinks
+	local x symlinks files
 
 	cd "$S" || die "cd failed"
 	for x in $(find bin -type d) ; do
 		exeinto $portage_base/$x || die "exeinto failed"
 		cd "$S"/$x || die "cd failed"
-		doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
-			die "doexe failed"
+		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
+		if [ -n "$files" ] ; then
+			doexe $files || die "doexe failed"
+		fi
 		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
 		if [ -n "$symlinks" ] ; then
 			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
@@ -182,6 +212,8 @@ src_install() {
 	for x in $(find pym/* -type d) ; do
 		insinto $portage_base/$x || die "insinto failed"
 		cd "$S"/$x || die "cd failed"
+		# __pycache__ directories contain no py files
+		[[ "*.py" != $(echo *.py) ]] || continue
 		doins *.py || die "doins failed"
 		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
 		if [ -n "$symlinks" ] ; then
@@ -202,13 +234,13 @@ src_install() {
 	doman "${S}"/man/*.[0-9]
 
 	echo 'Producing ChangeLog from Git history...'
-	( cd "${S}/.git" && git log --stat > "${S}"/ChangeLog )
+	( cd "${S}/.git" && git log > "${S}"/ChangeLog )
 	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die 'dodoc failed'
 	use doc && dohtml -r "${S}"/doc/*
 	use epydoc && dohtml -r "${WORKDIR}"/api
 
 	dodir /usr/bin
-	for x in ebuild egencache emerge portageq repoman ; do
+	for x in ebuild egencache emerge portageq quickpkg repoman ; do
 		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
 	done
 
@@ -220,7 +252,6 @@ src_install() {
 		env-update
 		etc-update
 		fixpackages
-		quickpkg
 		regenworld"
 	local x
 	for x in ${my_syms}; do



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gentoo-guis:master commit in: sys-apps/portage/
@ 2011-10-04 21:05 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2011-10-04 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     edccd0b1c08bd9ff96c6b0400e456e98e044e656
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 21:04:08 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Oct  4 21:04:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=edccd0b1

update portage manifest

---
 sys-apps/portage/Manifest |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c809263..57759c5 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
 EBUILD portage-8888.ebuild 11281 RMD160 2ea90c35486dde626a75d61adb4da28c53beadfb SHA1 349ab4574244bf0c4e63b596fc4f19c269215638 SHA256 d4a57fe4d78e69b4b4c029172052f29eb67d5f3e0b9adcec1d7aee8219fface4
-MISC ChangeLog 407 RMD160 7131f6d313087dd7a29f45f83c128c25decb7444 SHA1 27796a8cce236f8150c90385708bb0c182325880 SHA256 108009e9e1e3345d0d3e0d905d129d0af95dc3bfa840ed41b59372b2879b2657
+MISC ChangeLog 545 RMD160 4895c33219b1f1c5cff2ffc7ba5d746fa87bff36 SHA1 892823e1d0973ce009f6cf9d981d9b7244f73c2c SHA256 c1ab253bed90e25c5094fa10decde8f5dd9f7281c4d0743179a7f9887268850a



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gentoo-guis:master commit in: sys-apps/portage/
@ 2011-10-11 13:32 Dimitris Papapoulios
  0 siblings, 0 replies; 5+ messages in thread
From: Dimitris Papapoulios @ 2011-10-11 13:32 UTC (permalink / raw
  To: gentoo-commits

commit:     5f4afcadd0d7fc295dd459f91892796e9cf60687
Author:     Dimitris Papapoulios <skiarxon <AT> gmail <DOT> com>
AuthorDate: Tue Oct 11 13:22:37 2011 +0000
Commit:     Dimitris Papapoulios <skiarxon <AT> gmail <DOT> com>
CommitDate: Tue Oct 11 13:22:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=5f4afcad

removed .git in EGIT_REPO_URI

---
 sys-apps/portage/Manifest            |    2 +-
 sys-apps/portage/portage-8888.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 57759c5..755432f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-8888.ebuild 11281 RMD160 2ea90c35486dde626a75d61adb4da28c53beadfb SHA1 349ab4574244bf0c4e63b596fc4f19c269215638 SHA256 d4a57fe4d78e69b4b4c029172052f29eb67d5f3e0b9adcec1d7aee8219fface4
+EBUILD portage-8888.ebuild 11277 RMD160 04dc21092453111a06c35d97a76f8bc04e55551c SHA1 13982b1e3ced806b79db6d355b12fabc2439eca6 SHA256 4f68fd55f2a1d5553523cd046acca92e2d260fb60b800ade149c9ae986b95518
 MISC ChangeLog 545 RMD160 4895c33219b1f1c5cff2ffc7ba5d746fa87bff36 SHA1 892823e1d0973ce009f6cf9d981d9b7244f73c2c SHA256 c1ab253bed90e25c5094fa10decde8f5dd9f7281c4d0743179a7f9887268850a

diff --git a/sys-apps/portage/portage-8888.ebuild b/sys-apps/portage/portage-8888.ebuild
index 82173c4..9201675 100644
--- a/sys-apps/portage/portage-8888.ebuild
+++ b/sys-apps/portage/portage-8888.ebuild
@@ -58,7 +58,7 @@ prefix_src_archives() {
 	done
 }
 
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git"
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage"
 S="${WORKDIR}"/${PN}
 
 compatible_python_is_selected() {



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gentoo-guis:master commit in: sys-apps/portage/
@ 2011-10-31 10:41 Theo Chatzimichos
  0 siblings, 0 replies; 5+ messages in thread
From: Theo Chatzimichos @ 2011-10-31 10:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b784563e4deea35426c67b4785a1119a97f3fadd
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 10:41:21 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 10:41:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=b784563e

[sys-apps/portage-8888] Add blocker about portage-public-api

---
 sys-apps/portage/Manifest            |    2 +-
 sys-apps/portage/portage-8888.ebuild |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 755432f..1d6393d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,2 @@
-EBUILD portage-8888.ebuild 11277 RMD160 04dc21092453111a06c35d97a76f8bc04e55551c SHA1 13982b1e3ced806b79db6d355b12fabc2439eca6 SHA256 4f68fd55f2a1d5553523cd046acca92e2d260fb60b800ade149c9ae986b95518
+EBUILD portage-8888.ebuild 11310 RMD160 869923b38212870ba202642c9ce558f52319ed3e SHA1 c5b1e4a87382f2e208ee09f93c479a945bbaee0f SHA256 f998fc46bb5107bd617030d2c22563dcf20670df886374a5073a2d4350cc652f
 MISC ChangeLog 545 RMD160 4895c33219b1f1c5cff2ffc7ba5d746fa87bff36 SHA1 892823e1d0973ce009f6cf9d981d9b7244f73c2c SHA256 c1ab253bed90e25c5094fa10decde8f5dd9f7281c4d0743179a7f9887268850a

diff --git a/sys-apps/portage/portage-8888.ebuild b/sys-apps/portage/portage-8888.ebuild
index 9201675..07c41a6 100644
--- a/sys-apps/portage/portage-8888.ebuild
+++ b/sys-apps/portage/portage-8888.ebuild
@@ -38,7 +38,8 @@ RDEPEND="${python_dep}
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17"
+	!<app-shells/bash-3.2_p17
+	!app-portage/portage-public-api"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gentoo-guis:master commit in: sys-apps/portage/
@ 2015-04-16 19:24 Brian Dolbec
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Dolbec @ 2015-04-16 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     aeb79da4b40c761c2b83a54f11747829934a1704
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  7 04:38:07 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar  7 04:40:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-guis.git/commit/?id=aeb79da4

Remove obsolete portage ebuild and ChangeLog

 sys-apps/portage/ChangeLog           |  11 --
 sys-apps/portage/Manifest            |   2 -
 sys-apps/portage/portage-8888.ebuild | 361 -----------------------------------
 3 files changed, 374 deletions(-)

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
deleted file mode 100644
index 40bd0fe..0000000
--- a/sys-apps/portage/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-# ChangeLog for sys-apps/portage
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header:                                                                                                   Exp $
-
-  27 May 2011; Brian Dolbec <brian.dolbec@gmail.com> portage-8888.ebuild:
-  update portage-8888.ebuild to the latest-9999.ebuild changes
-
-*portage-8888 (1 Aug 2010)
-
-  1 Aug 2010; Brian Dolbec <brian.dolbec@gmail.com>  +portage-8888.ebuild:
-  initial copy/edit of the portage-9999.ebuild for the public_api development branch

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
deleted file mode 100644
index ec1bbe2..0000000
--- a/sys-apps/portage/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD portage-8888.ebuild 11310 SHA256 f998fc46bb5107bd617030d2c22563dcf20670df886374a5073a2d4350cc652f SHA512 ce61e769e9f25b10bfe3216813d4e491dde8b44d7731e2f52a72cf3dea0456493856741eadb70036513bb4f8e1291e08b12046cfadf72433f93f71a6a9620ae6 WHIRLPOOL 70f158f622993104b87e77e9a1bb016585b9a70f3be69caf349500d18d74aaad67b7b419c1f8a071f728dd777bcf46358b1f119dd8e84ee2709e9df4119daef9
-MISC ChangeLog 545 SHA256 c1ab253bed90e25c5094fa10decde8f5dd9f7281c4d0743179a7f9887268850a SHA512 9055a72001545c6fb5521fd188582d802234b93af2ecaebfdfd78878c367db3daff37cbb2f8b20429c40d85f5787995879caa2819120221f99160efe66a71065 WHIRLPOOL ea45e1e8a97f9f1e8bb29f91b1b6b94973aeb80661889318a56e45b1f5176ec171acdef0a35990db4651db210575bcd3b5d82058d8ee08d227c2db9ea3d5abad

diff --git a/sys-apps/portage/portage-8888.ebuild b/sys-apps/portage/portage-8888.ebuild
deleted file mode 100644
index 07c41a6..0000000
--- a/sys-apps/portage/portage-8888.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-8888.ebuild,v 1.23 2011/05/26  dol-sen Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-EGIT_BRANCH="public_api"
-inherit git-2 eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS=""
-PROVIDE="virtual/portage"
-SLOT="0"
-IUSE="build doc epydoc +ipc python2 python3 selinux"
-
-python_dep="python3? ( =dev-lang/python-3* )
-	!python2? ( !python3? (
-		build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )
-		!build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )
-	) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!app-portage/portage-public-api"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# rsync-2.6.4 rdep is for the --filter option #167668
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage"
-S="${WORKDIR}"/${PN}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
-	_version=${_version:1}
-	einfo "Setting portage.VERSION to ${_version} ..."
-	sed -e "s/^VERSION=.*/VERSION='${_version}'/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${_version}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-			epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
-
-src_test() {
-	./runtests.sh || die "tests failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf || die
-
-	insinto "$portage_share_config/sets"
-	doins "$S"/cnf/sets/*.conf || die
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example || die
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		newins make.conf make.conf.example || die
-	fi
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
-	fi
-
-	local x symlinks files
-
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d) ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		doins *.py || die "doins failed"
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	exeinto ${portage_base}/pym/portage/tests
-	doexe  "${S}"/pym/portage/tests/runTests
-
-	doman "${S}"/man/*.[0-9]
-
-	echo 'Producing ChangeLog from Git history...'
-	( cd "${S}/.git" && git log > "${S}"/ChangeLog )
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die 'dodoc failed'
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-}
-
-pkg_preinst() {
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-	if [ -f "${ROOT}/etc/make.globals" ]; then
-		rm "${ROOT}/etc/make.globals"
-	fi
-
-	has_version "<${CATEGORY}/${PN}-2.2_alpha"
-	MINOR_UPGRADE=$?
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5"
-	WORLD_MIGRATION_UPGRADE=$?
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
-	NEEDED_REBUILD_UPGRADE=$?
-
-	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
-	REPO_LAYOUT_CONF_WARN=$?
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${ROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
-	fi
-
-	if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${ROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
-		done
-	fi
-
-	if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
-		ewarn
-		echo "If you want overlay eclasses to override eclasses from" \
-			"other repos then see the portage(5) man page" \
-			"for information about the new layout.conf and repos.conf" \
-			"configuration files." \
-			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-		ewarn
-	fi
-
-	einfo
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo
-
-	if [ $MINOR_UPGRADE = 0 ] ; then
-		elog "If you're upgrading from a pre-2.2 version of portage you might"
-		elog "want to remerge world (emerge -e world) to take full advantage"
-		elog "of some of the new features in 2.2."
-		elog "This is not required however for portage to function properly."
-		elog
-	fi
-
-	if [ -z "${PV/*_rc*}" ]; then
-		elog "If you always want to use the latest development version of portage"
-		elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-04-16 19:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-27  5:15 [gentoo-commits] proj/gentoo-guis:master commit in: sys-apps/portage/ Brian Dolbec
  -- strict thread matches above, loose matches on Subject: below --
2011-10-04 21:05 Brian Dolbec
2011-10-11 13:32 Dimitris Papapoulios
2011-10-31 10:41 Theo Chatzimichos
2015-04-16 19:24 Brian Dolbec

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox