New release

Package-Manager: portage-1.524.2.59-cvs

5 files changed, 205 insertions, 6 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 92f1de925f23..99ae429f53d3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 30d382e0a20f8b25e643e0e4ac60e949 ChangeLog 806
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
 MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133
 MD5 f9fd4371c2fb44b47a0a5d3cfd4f118c portage-2.0.51.18.ebuild 13211
 MD5 985b398e1a2d623efa13c1c1fbe18119 portage-2.0.51.19.ebuild 13211
-MD5 86ad17271b9173f6be6e026d5a73c8e5 portage-2.0.51.20.ebuild 6123
+MD5 8e2752c4a938fa86fb65ad1cc28f6aac portage-2.0.51.20-r1.ebuild 6107
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
 MD5 4458663c2aa36fb828981a89ffcaac97 files/digest-portage-2.0.51.18 70
 MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
-MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20 70
-MD5 4662637417646876c0b75afb63413920 files/dispatch-conf-fixes.patch 1379
+MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244
+MD5 502ca546fcf8ca5141435a9edee6a57f files/repoman-fixes.patch 417
+MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCajvOxvWNPsk/ZP4RAhZKAJwPihMmOyP/z+hPbXTWoxr8Zv9oDQCbBshJ
+ea85GODNyyNxk8eZ+rlN9+A=
+=Kf53
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.0.51.20-r1 b/sys-apps/portage/files/digest-portage-2.0.51.20-r1
new file mode 100644
index 000000000000..50f1663b40b0
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.0.51.20-r1
@@ -0,0 +1 @@
+MD5 2a954eb155660fea05276f648816de34 portage-2.0.51.20.tar.bz2 254269
diff --git a/sys-apps/portage/files/dispatch-conf-fixes.patch b/sys-apps/portage/files/dispatch-conf-fixes.patch
index bb6f0154eacb..0a70537ca183 100644
--- a/sys-apps/portage/files/dispatch-conf-fixes.patch
+++ b/sys-apps/portage/files/dispatch-conf-fixes.patch
@@ -1,4 +1,3 @@
-diff -u -r1.7.2.8 dispatch-conf
 --- bin/dispatch-conf	17 Apr 2005 09:01:55 -0000	1.7.2.8
 +++ bin/dispatch-conf	23 Apr 2005 11:15:53 -0000
 @@ -186,7 +186,7 @@
@@ -10,8 +9,6 @@ diff -u -r1.7.2.8 dispatch-conf
                      shutil.copyfile(merged, mrgconf)
                      os.remove(merged)
                      mystat = os.lstat(conf['new'])
-===================================================================
-diff -u -r1.3.2.2 dispatch_conf.py
 --- pym/dispatch_conf.py	17 Apr 2005 09:01:55 -0000	1.3.2.2
 +++ pym/dispatch_conf.py	23 Apr 2005 11:15:54 -0000
 @@ -33,7 +33,10 @@
diff --git a/sys-apps/portage/files/repoman-fixes.patch b/sys-apps/portage/files/repoman-fixes.patch
new file mode 100644
index 000000000000..97fbfbac3edc
--- /dev/null
+++ b/sys-apps/portage/files/repoman-fixes.patch
@@ -0,0 +1,11 @@
+--- bin/repoman	23 Apr 2005 07:26:04 -0000	1.98.2.18
++++ bin/repoman	23 Apr 2005 12:06:57 -0000
+@@ -1399,7 +1399,7 @@
+ 	mysigs=[]
+ 	if myheaders or myupdates or myremoved or mynew:
+ 		myfiles=myheaders+myupdates+myremoved+mynew
+-		for x in range(len(myfiles), -1, -1):
++		for x in range(len(myfiles)-1, -1, -1):
+ 			if not os.path.exists(myfiles[x]) or not os.path.isdir(myfiles[x]):
+ 				del myfiles[x]
+ 		mydone=[]
diff --git a/sys-apps/portage/portage-2.0.51.20-r1.ebuild b/sys-apps/portage/portage-2.0.51.20-r1.ebuild
new file mode 100644
index 000000000000..dec7b42b3611
--- /dev/null
+++ b/sys-apps/portage/portage-2.0.51.20-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r1.ebuild,v 1.1 2005/04/23 12:12:44 jstubbs Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
+HOMEPAGE="http://www.gentoo.org/"
+
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+#KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
+KEYWORDS="  ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+RESTRICT="nosandbox sandbox multilib-pkg-force"
+
+# Disable the sandbox on portages that don't support RESTRICT="nosandbox"
+export SANDBOX_DISABLED="1"
+
+IUSE="build sandbox selinux"
+DEPEND=""
+RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) sandbox? ( sys-apps/sandbox ) selinux? ( >=dev-python/python-selinux-2.15 )"
+
+S=${WORKDIR}/${PN}-${PV}
+
+
+python_has_lchown() {
+	[ "$(python -c 'import os; print "lchown" in dir(os)')" = "True" ]
+}
+
+src_unpack() {
+	unpack ${A}
+	patch -d ${S} -p0 -g0 < ${FILESDIR}/dispatch-conf-fixes.patch
+	patch -d ${S} -p0 -g0 < ${FILESDIR}/repoman-fixes.patch
+}
+
+src_compile() {
+	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
+
+	export CC="$(tc-getCC)"
+	cd ${S}/src
+	${CC} ${CFLAGS} -o tbz2tool tbz2tool.c
+
+	if ! python_has_lchown; then
+		cd ${S}/src/python-missingos
+		./setup.py build || die "Failed to build missingos module"
+	fi
+
+	if use x86-fbsd; then
+		cd ${S}/src/bsd-flags
+		./setup.py build || die "Failed to install bsd-chflags module"
+	fi
+}
+
+src_install() {
+	cd ${S}/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf make.globals
+	if [ -f "make.globals.${ARCH}" ]; then
+		newins make.conf.${ARCH} make.conf.example
+	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
+	fi
+
+	if ! python_has_lchown; then
+		cd ${S}/src/python-missingos
+		./setup.py install --root ${D} || die "Failed to install missingos module"
+	fi
+
+	if use x86-fbsd; then
+		cd ${S}/src/bsd-flags
+		./setup.py install --root ${D} || die "Failed to install bsd-chflags module"
+	fi
+
+	dodir /usr/lib/portage/bin
+	exeinto /usr/lib/portage/bin
+	cd ${S}/bin
+	doexe *
+	doexe ${S}/src/tbz2tool
+	dosym newins /usr/lib/portage/bin/donewins
+
+	dodir /usr/lib/portage/pym
+	insinto /usr/lib/portage/pym
+	cd ${S}/pym
+	doins *
+
+	doman ${S}/man/*.[0-9]
+	dodoc ${S}/ChangeLog
+
+	dodir /usr/bin /usr/sbin
+	dosym ../lib/portage/bin/emerge /usr/bin/emerge
+	dosym ../lib/portage/bin/xpak /usr/bin/xpak
+	dosym ../lib/portage/bin/repoman /usr/bin/repoman
+	dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool
+	dosym ../lib/portage/bin/portageq /usr/bin/portageq
+	dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg
+	dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl
+
+	dosym ../lib/portage/bin/env-update /usr/sbin/env-update
+	dosym ../lib/portage/bin/ebuild /usr/sbin/ebuild
+	dosym ../lib/portage/bin/etc-update /usr/sbin/etc-update
+	dosym ../lib/portage/bin/dispatch-conf /usr/sbin/dispatch-conf
+	dosym ../lib/portage/bin/archive-conf /usr/sbin/archive-conf
+	dosym ../lib/portage/bin/fixpackages /usr/sbin/fixpackages
+	dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld
+	dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync
+}
+
+pkg_preinst() {
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf ${IMAGE}/usr/lib/portage/pym/*
+		mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
+		rm -rf ${IMAGE}/usr/lib/portage/bin/*
+		mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
+	fi
+}
+
+pkg_postinst() {
+	local x
+
+	[ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf
+
+	#disable global sandbox if it's active (it's been deprecated)
+	if [ -f /etc/ld.so.preload ] ; then
+		cp /etc/ld.so.preload ${T}
+		grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
+	fi
+
+	#yank old cache files
+	if [ -d /var/cache/edb ]
+	then
+		rm -f /var/cache/edb/xcache.p
+		rm -f /var/cache/edb/mtimes
+	fi
+
+	install -o root -g portage -m 0755 -d "${ROOT}/etc/portage"
+
+	if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
+	   [ -f ${ROOT}/var/cache/edb/world ] &&
+	   [ ! -h ${ROOT}/var/cache/edb/world ]; then
+		mv ${ROOT}/var/cache/edb/world ${ROOT}/var/lib/portage/world
+		ln -s ../../lib/portage/world /var/cache/edb/world
+	fi
+
+	echo
+	einfo "Feature additions are noted in help and make.conf descriptions."
+	echo
+	einfo "Update configs using 'etc-update' please. Maintaining current configs"
+	einfo "for portage and other system packages is fairly important for the"
+	einfo "continued health of your system."
+	echo
+	ewarn "NOTICE: There have been changes in the location of some internal files"
+	ewarn "        to better match the FHS. The changes do not directly affect users"
+	ewarn "        but please be advised that changing between versions of portage"
+	ewarn "        with and without these changes may introduce some inconsistencies"
+	ewarn "        in package data regarding 'world' and 'virtuals' (provides)."
+	echo
+	einfo "        /var/cache/edb/world has moved to /var/lib/portage/world"
+	echo
+	einfo "        /var/cache/edb/virtuals has been deprecated and is now calculated"
+	einfo "        on demand. Strictly _USER_ modifications to virtuals may go into"
+	einfo "        /etc/portage/profile/virtuals and will not be modified by portage."
+	echo
+
+	for X in ${ROOT}etc/._cfg????_make.globals; do
+		# Overwrite the globals file automatically.
+		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
+	done
+
+	einfo "You may run 'emerge metadata' to perform cache updates if you have"
+	einfo "changed versions of portage. This will provide a fairly dramatic"
+	einfo "speedup. Alternatively, you may 'emerge sync' if it has been more"
+	einfo "than 30 minutes since your last sync."
+}