Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kuroo

6 files changed, 352 insertions, 10 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 483fa92..4486285 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,16 +1,18 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header:                                                                                                   Exp $
-   
-    17 Jul 2010; Brian Dolbec <brian.dolbec@gmail.com>  re-version
-    this live ebuild to layman-8888 so it does not conflict with other versions.
-    It also makes it easier to spec on only this version for other development 
-    packages.
 
+  01 Aug 2010; Brian Dolbec <brian.dolbec@gmail.com> layman-8888.ebuild:
+  Change to url to the static ip due to the dns problem
+
+  17 Jul 2010; Brian Dolbec <brian.dolbec@gmail.com>  re-version
+  this live ebuild to layman-8888 so it does not conflict with other versions.
+  It also makes it easier to spec on only this version for other development 
+  packages.
 
-    17 Jul 2010; Brian Dolbec <brian.dolbec@gmail.com>  fix the ebuild 
-    to use the proper git branch.
 
+  17 Jul 2010; Brian Dolbec <brian.dolbec@gmail.com>  layman-8888.ebuild:
+  fix the ebuild to use the proper git branch.
 
 *layman-9999 (17 Jul 2010)
    
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index cf5f2f5..b77dc4f 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,3 +1,3 @@
-EBUILD layman-8888.ebuild 2813 RMD160 f9bfc014839d4ba0afa4c4f3973d79b1e41c0e25 SHA1 98e73b0e1ff4b1c4f5b35f03296693b2767b0de5 SHA256 9329e9e383fd95004750c625b54ffe302de828f37a839fe93d7b9efd74eb155d
-MISC ChangeLog 763 RMD160 e2ace04f2d23ba8c8b1d61188991ba5791763b3f SHA1 77e900b5cda885f182db3e2e81b28f25cc01c9e0 SHA256 0d86535c921d968789dd80dc8278ead325fa5fb09d916712a4ed4bff1a5e08d9
+EBUILD layman-8888.ebuild 2877 RMD160 1a106713264d39a1e131beb1a30f4317927f8a59 SHA1 6857328b0fddab58a99a74c70892c3eebae851eb SHA256 f45991b92294236463c2aeb010cf7881dac003b047e6490e4644df249f0aefb6
+MISC ChangeLog 896 RMD160 389f294052d8046e161ce7b3fa48e7b554c8acbb SHA1 3dc485d45d8ec3d97fa066934a211f938758d939 SHA256 badb5f3d7afc3fdaa9ac789ea115f7d951b8ffb6aa2abd6fcabd9992da4f5ef1
 MISC metadata.xml 694 RMD160 2d94d6fe07b5d1c0dbff3721e8cdadf01d4f1c7e SHA1 af01ebe23677e8eb5535ad6c21984754e7497de0 SHA256 d4e6382743033a5e00938d1d494aa6258486cd53cba68b80ba0df6dc296d4843
diff --git a/app-portage/layman/layman-8888.ebuild b/app-portage/layman/layman-8888.ebuild
index a091651..b827d6a 100644
--- a/app-portage/layman/layman-8888.ebuild
+++ b/app-portage/layman/layman-8888.ebuild
@@ -12,7 +12,8 @@ inherit eutils distutils git
 DESCRIPTION="An experimental development version of layman, a python script for retrieving gentoo overlays."
 HOMEPAGE="http://dev.gentooexperimental.org/~dol-sen/ http://layman.sourceforge.net"
 SRC_URI=""
-EGIT_REPO_URI="http://dev.gentooexperimental.org/~dol-sen/git/layman.git/"
+#EGIT_REPO_URI="http://dev.gentooexperimental.org/~dol-sen/git/layman.git/"
+EGIT_REPO_URI="http://91.191.147.225/~dol-sen/git/layman.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
new file mode 100644
index 0000000..74146ea
--- /dev/null
+++ b/sys-apps/portage/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for sys-apps/portage
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header:                                                                                                   Exp $
+
+*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
new file mode 100644
index 0000000..3b1de4d
--- /dev/null
+++ b/sys-apps/portage/Manifest
@@ -0,0 +1,2 @@
+EBUILD portage-8888.ebuild 10134 RMD160 8e36eafa87b3fe53e2c0acec747dc110ac843c33 SHA1 ec90ed8f5761941b34719dd437ee7c8c8a8659fc SHA256 0fe72b5671b435dcf564a7e8acfc60f6e81ef4ea2e4418aa4f33630d07e1168a
+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
new file mode 100644
index 0000000..6348aac
--- /dev/null
+++ b/sys-apps/portage/portage-8888.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2010 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 $
+
+# 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
+
+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 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 ) )"
+
+# 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 )"
+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.git"
+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() {
+	if ! 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
+	fi
+}
+
+src_prepare() {
+	local _version="'$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')'[1:]"
+	einfo "Setting portage.VERSION to ${_version} ..."
+	sed -i "s/^VERSION=.*/VERSION=${_version}/" pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+
+	if use python3; then
+		python_convert_shebangs -r 3 .
+	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() {
+	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
+}
+
+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
+
+	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"
+		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"
+		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 --stat > "${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
+		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
+		quickpkg
+		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
+}