Call the new Makefile for src_compile and src_install.

Package-Manager: portage-2.2.0_alpha90_p21/cvs/Linux i686

3 files changed, 48 insertions, 131 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 17155e635372..bfd24abb2a27 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.976 2012/03/16 19:12:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.977 2012/03/17 01:57:23 zmedico Exp $
+
+  17 Mar 2012; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Call the new Makefile for src_compile and src_install.
 
   16 Mar 2012; Brent Baude <ranger@gentoo.org> portage-2.1.10.49.ebuild:
   Marking portage-2.1.10.49 ppc for bug 408391
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 78a0cf7cbede..8e73e0c34559 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.44.tar.bz2 781681 RMD160 b26cd8102620f966eefb2bf5214080d6ce0d8fc1 SHA1 1e1417d1b534fedb4e6ae749fc807c7ba8088a44 SHA256 688494c4b76189550e1a437835f8276f2047992ed6c617f62b01e459f8fbdf04
 DIST portage-2.1.10.49.tar.bz2 803941 RMD160 088a21151b66c7fdb4ed39c46b25fee1b4ecce9e SHA1 11322e216b6d6a2f753f45a150c3f618e4bf0c45 SHA256 b50cdbb4ececba27cddfe24d63517c73a32b905bcf3b7d55b692f6661247590e
@@ -16,6 +19,13 @@ EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27
 EBUILD portage-2.2.0_alpha84.ebuild 14659 RMD160 09e616348d4c80ad061b38ec39c3f4f1a441fdc0 SHA1 6ff7a8994c633913d4fb8b9a028cd206d5d20731 SHA256 2ef692472862dd8d2089824ee5f810bf0899743a19702501012fc5dad34c9c49
 EBUILD portage-2.2.0_alpha89.ebuild 15740 RMD160 488c3ae4e6afb1fc1c03fe746466e0fbdb4f0770 SHA1 1ccc3403ec313a21a0016f79b2c11eca5f7235d6 SHA256 c0b562a3f7b52f202e4c0e7b814ad3de869c22a3e9e7429d7858909e136baf08
 EBUILD portage-2.2.0_alpha90.ebuild 15740 RMD160 c7c8e43db1583c2271fe815ef4eab1fc49c8ab71 SHA1 c9355ca13887c7e799606c1777cdcb9b09cc5a9e SHA256 5eaf694e38244f8ae61ae77dfb48aa2ecb814720a9f3b1825dcc0717ba8bd23c
-EBUILD portage-9999.ebuild 14911 RMD160 1c281568e5f8ea9964e123fac9d290eaad86254f SHA1 24adbc408a86ec5c63570dfdbd4fd5d984dd4d99 SHA256 5a704b58afb2fa2965aa1a4dbdd730c47568eb0d8769fd7a9f009d76f9eaae4f
-MISC ChangeLog 81089 RMD160 37db56892403f6b1c140d66385327135f05875d2 SHA1 641c392e0b80d9e1e6e01abd3739d8fd8c79ca39 SHA256 b8c6c3666c6a4cd2c52e6e16505c5a344f9ff7cf3d4c034778531b41cf6bc913
+EBUILD portage-9999.ebuild 11689 RMD160 2069423adeb2be13ec8e97688f7daf53179f2d4d SHA1 7ff962897f53b201b7340176a2acf48a57027954 SHA256 c3b48d7d8e0eaa9e99834e9b50fcd967bfd99bde5cae59a5da0efd074a90530c
+MISC ChangeLog 81216 RMD160 0bd743e666f0017729d4eac5bca8bff9ccafbcbc SHA1 ae46df8cddca43621bf090a70ed74a0fad0aa83f SHA256 8f2af765b1ea29b22e94a221ad0b2971a4f47ca8db66be44935b37c80487fe1a
 MISC metadata.xml 926 RMD160 9fd2d499d8102a870e45e63ec68400d71de950c6 SHA1 83f8455f45d0baaedcbbd3fc0186cccad54af7b9 SHA256 2609962ab6a20df40f95053513e6aca76b24caee81e7b3f45de7e3c7e33eec25
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk9j74gACgkQ/ejvha5XGaO8qwCgmmkfnubMc9p/0Za4Sn20UVhY
+xpIAoOkigQ/eZ3MyVlYVZY1MIrOpFIwM
+=8Gfh
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 80df91321f0c..7a8e0173226a 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.44 2012/02/18 23:11:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.45 2012/03/17 01:57:23 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -122,6 +122,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	einfo "Producing ChangeLog from Git history..."
+	pushd "${S}/.git" >/dev/null || die
+	git log ebcf8975b37a8aae9735eb491a9b4cb63549bd5d^.. \
+		> "${S}"/ChangeLog || die
+	popd >/dev/null || die
+
 	local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')
 	_version=${_version:1}
 	einfo "Setting portage.VERSION to ${_version} ..."
@@ -187,151 +193,49 @@ src_prepare() {
 		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
 			|| die "failed to append to make.globals"
 	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
+	cd "${S}/cnf" || 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"
+		rm -f "${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 "${ED}$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; 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 "${ED}$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	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
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
 
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
 
-	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
+src_test() {
+	./runtests.sh || die "tests failed"
+}
 
-	dodir /etc/portage
-	keepdir /etc/portage
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/etc" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
 }
 
 pkg_preinst() {