Updated to Manifest2, do you need to upgrade portage to use my overlay.

svn path=/; revision=108

7 files changed, 95 insertions, 41 deletions

diff --git a/app-portage/drizzt-scripts/Manifest b/app-portage/drizzt-scripts/Manifest
index e1bb234..75b8d9c 100644
--- a/app-portage/drizzt-scripts/Manifest
+++ b/app-portage/drizzt-scripts/Manifest
@@ -1,34 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dmake 1431 RMD160 38c32a3e0189c0f18804a28a9759586c66290d5a SHA1 411db5221ce1a9c4893fa9f0a2706c6204fc0851 SHA256 eca8ffccc14acd9ffaf7ee0332caf6d42ecc764ebcccab0fedf2f9e28c8b129d
 AUX ecommit 1164 RMD160 9ea549b7e8d8612033ca6e0defe18c4cd5f8a2b7 SHA1 3415e5bd36b979c2ae88c2d5bb3d7b79df47e957 SHA256 7a5c161cfeced36539727fc13aa0345543220a1b7a26a63d9a60e8059497a98c
-MD5 757cacc68de818c421b48b866b9e0411 files/ecommit 1164
-RMD160 9ea549b7e8d8612033ca6e0defe18c4cd5f8a2b7 files/ecommit 1164
-SHA256 7a5c161cfeced36539727fc13aa0345543220a1b7a26a63d9a60e8059497a98c files/ecommit 1164
-AUX fix_overlay 1709 RMD160 85009e1ac170700b8e185fea85e64d991fdb42f9 SHA1 c079e7d8724982654d79fbc3727016809223bb1b SHA256 cc31138f0f54ba6e1c6d02032c8b81a9fe1ff36378bb5d51e1b6dbbdc43040b0
-MD5 263097be95231fa55f585be3eb89ff2a files/fix_overlay 1709
-RMD160 85009e1ac170700b8e185fea85e64d991fdb42f9 files/fix_overlay 1709
-SHA256 cc31138f0f54ba6e1c6d02032c8b81a9fe1ff36378bb5d51e1b6dbbdc43040b0 files/fix_overlay 1709
+AUX fix_overlay 1709 RMD160 a8d4d8237a078b211b992c0627f559bb9405d9ae SHA1 dbb0cbc9b859ae2b9d2a7c83207f19df766ffeab SHA256 ad08a2279a0991d41f48f4eb974b835da355ab7d978aca985ff63765ff424fd3
+AUX gen_metadata 788 RMD160 1f4c98357d373ae8c4b146a3e08f065b1158f488 SHA1 154b86e742b8c57b0b7a5afcce6e5b63813b81d4 SHA256 57002c6da0e92db66a674cc3be0682055ed680943ea8cf20a616f06ce328475d
 AUX rdep 2647 RMD160 46e799298a9eec70ec121695e83651fd9c7150f6 SHA1 d6e31cb976ef7ff9bce7ae79d5e4d200ce552a8b SHA256 c03a200bb20a18898464881a7bbb563ee5bc1c768764e4e275e0dcef9322865e
-MD5 31f93266c9b232fb245557d968d99e0d files/rdep 2647
-RMD160 46e799298a9eec70ec121695e83651fd9c7150f6 files/rdep 2647
-SHA256 c03a200bb20a18898464881a7bbb563ee5bc1c768764e4e275e0dcef9322865e files/rdep 2647
 DIST earch-0.9.2 9420 RMD160 77189c92515ea029fa048a5e2c868275233d75eb SHA1 ad1b5e48e002126749f53751d5b0354c78412827 SHA256 b39fd5e63f0b4c8d265f5ce1c731a5a550db5020f2d36b4363525cb675909f02
-EBUILD drizzt-scripts-1.0-r1.ebuild 557 RMD160 a57f8b711e1170f97aa8020bf05031f75696d4ad SHA1 fce4d925f857d04f3eaf4271ab44d694e8fcd383 SHA256 96c1dce0e6d3764bc9e47f7c799cbfc8bd089b5e5b45d097325f0a4d67ed4da7
-MD5 a21502f8c7281f2349c0ab2f37c587c1 drizzt-scripts-1.0-r1.ebuild 557
-RMD160 a57f8b711e1170f97aa8020bf05031f75696d4ad drizzt-scripts-1.0-r1.ebuild 557
-SHA256 96c1dce0e6d3764bc9e47f7c799cbfc8bd089b5e5b45d097325f0a4d67ed4da7 drizzt-scripts-1.0-r1.ebuild 557
+EBUILD drizzt-scripts-1.0-r1.ebuild 577 RMD160 d9f98ad8db82917a91081854e72d122ebb0f7335 SHA1 7eee9e7298af6080b2d60e0fdbbd1af57957c428 SHA256 fa2f603ed2b8abe5332429382394118c4a103a914868b04b0025a5afb31f4546
 MISC ChangeLog 643 RMD160 53d7131574de1566cbaa94c0229a176f0d87e09c SHA1 dad23f1c309dd18e463ec3b30fe55193df8a7cb0 SHA256 c18002b3278ab1dc1300379a2d1500f443ab0e687b1e84e5946961f4a770add3
-MD5 16c7d993f61dd02dfbbf5de1bde2a0ca ChangeLog 643
-RMD160 53d7131574de1566cbaa94c0229a176f0d87e09c ChangeLog 643
-SHA256 c18002b3278ab1dc1300379a2d1500f443ab0e687b1e84e5946961f4a770add3 ChangeLog 643
-MD5 34186fca07034de4645e54cd5d3b0f54 files/digest-drizzt-scripts-1.0-r1 208
-RMD160 608387b5eb8bf3ce862957f9744210ec113024a3 files/digest-drizzt-scripts-1.0-r1 208
-SHA256 e333bde7819fdd6ae0831c9bfd8d974139f8010f5d57af3d9daf3b08845a83ba files/digest-drizzt-scripts-1.0-r1 208
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF4ugKGDyatLGpTbYRAvaWAJ99T+cTwtsB/i+nATa8ZnvZyTUXYACfS4pE
-Ms00xw+xN0bDyxXhvbL1YQc=
-=nRvK
------END PGP SIGNATURE-----
diff --git a/app-portage/drizzt-scripts/drizzt-scripts-1.0-r1.ebuild b/app-portage/drizzt-scripts/drizzt-scripts-1.0-r1.ebuild
index f2d392b..64822b5 100644
--- a/app-portage/drizzt-scripts/drizzt-scripts-1.0-r1.ebuild
+++ b/app-portage/drizzt-scripts/drizzt-scripts-1.0-r1.ebuild
@@ -18,5 +18,6 @@ DEPEND=""
 src_install() {
 	newbin "${DISTDIR}"/earch-0.9.2 earch
 	use ruby && dobin "${FILESDIR}"/rdep
-	dobin "${FILESDIR}"/ecommit "${FILESDIR}"/fix_overlay
+	dobin "${FILESDIR}"/ecommit "${FILESDIR}"/fix_overlay "${FILESDIR}"/dmake \
+	"${FILESDIR}"/gen_metadata
 }
diff --git a/app-portage/drizzt-scripts/files/digest-drizzt-scripts-1.0 b/app-portage/drizzt-scripts/files/digest-drizzt-scripts-1.0
deleted file mode 100644
index 881160b..0000000
--- a/app-portage/drizzt-scripts/files/digest-drizzt-scripts-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a0cbb14d03b6aa6f1060c89a97e59331 earch-0.9.2 9420
-RMD160 77189c92515ea029fa048a5e2c868275233d75eb earch-0.9.2 9420
-SHA256 b39fd5e63f0b4c8d265f5ce1c731a5a550db5020f2d36b4363525cb675909f02 earch-0.9.2 9420
diff --git a/app-portage/drizzt-scripts/files/digest-drizzt-scripts-1.0-r1 b/app-portage/drizzt-scripts/files/digest-drizzt-scripts-1.0-r1
deleted file mode 100644
index 881160b..0000000
--- a/app-portage/drizzt-scripts/files/digest-drizzt-scripts-1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a0cbb14d03b6aa6f1060c89a97e59331 earch-0.9.2 9420
-RMD160 77189c92515ea029fa048a5e2c868275233d75eb earch-0.9.2 9420
-SHA256 b39fd5e63f0b4c8d265f5ce1c731a5a550db5020f2d36b4363525cb675909f02 earch-0.9.2 9420
diff --git a/app-portage/drizzt-scripts/files/dmake b/app-portage/drizzt-scripts/files/dmake
new file mode 100644
index 0000000..901fe7c
--- /dev/null
+++ b/app-portage/drizzt-scripts/files/dmake
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Copyright 2007 Timothy Redaelli <drizzt@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+function einfo() {
+	echo -e " \e[32;01m*\e[0m $*"
+}
+
+function ewarn() {
+	echo -e " \e[33;01m*\e[0m $*" >&2
+}
+
+CHOST=$(gcc -v 2>&1 | awk '/^Target: /{print $2}')
+export AS="/usr/${CHOST}/bin/as"
+export LD="/usr/${CHOST}/bin/ld"
+
+if type ccache &>/dev/null; then
+	einfo "ccache detected"
+	export PATH="/usr/lib/ccache/bin/:$PATH"
+	export CC="/usr/lib/ccache/bin/${CHOST}-gcc"
+	export CXX="/usr/lib/ccache/bin/${CHOST}-g++"
+fi
+
+if type distcc &>/dev/null; then
+	einfo "distcc detected"
+	if [[ -z "$DISTCC_HOSTS" ]]; then
+		for i in $(</etc/distcc/hosts); do
+			ip=${i%/*}
+			port=${ip#*:}
+			[[ "${port}" = "${ip}" ]] && port=3632 || ip=${ip%:*}
+			if ( > "/dev/tcp/${ip}/${port}" ) 2>/dev/null || [[ ${ip} = localhost ]]; then
+				DISTCC_HOSTS="${DISTCC_HOSTS} ${i}"
+			else
+				ewarn "${ip}:${port} is not available."
+			fi
+		done
+	fi
+	if [[ "${DISTCC_HOSTS}" ]]; then
+		export DISTCC_HOSTS=${DISTCC_HOSTS}
+		MAKEOPTS="-j$(($(for i in ${DISTCC_HOSTS}; do echo -n ${i#*/}+; done ; echo 0)))"
+		if type ccache &>/dev/null; then
+			export CCACHE_PREFIX="distcc"
+		else
+			export PATH="/usr/lib/distcc/bin/:$PATH"
+			export CC="/usr/lib/distcc/bin/${CHOST}-gcc"
+			export CXX="/usr/lib/distcc/bin/${CHOST}-g++"
+		fi
+		einfo "I'm using distcc with \"${DISTCC_HOSTS}\""
+	 fi
+fi
+
+make -e ${MAKEOPTS} "$@"
diff --git a/app-portage/drizzt-scripts/files/fix_overlay b/app-portage/drizzt-scripts/files/fix_overlay
index 286579a..bf53ae0 100644
--- a/app-portage/drizzt-scripts/files/fix_overlay
+++ b/app-portage/drizzt-scripts/files/fix_overlay
@@ -7,6 +7,10 @@ if [[ ! -f "${1:-.}"/profiles/repo_name ]]; then
     exit 1
 fi
 
+ebegin "Generating categories"
+find "${1:-.}" -maxdepth 1 -mindepth 1 -type d -not -name licenses -not -name profiles -not -name '.*' | sed 's:^.*/::' | sort > "${1:-.}"/profiles/categories
+eend
+
 ebegin "Generating thirdpartymirrors"
 if type -p paludis &>/dev/null; then
     find "${1:-.}" -name '*.ebuild' | sed 's|^\./\([^/]*\)/[^/]*\(/[^/]*\).ebuild$|=\1\2::'"$(<"${1:-.}"/profiles/repo_name)"'|' | xargs paludis -qM | grep '^[[:space:]]*SRC_URI: ' | sed -e 's|mirror://[^ ]*|\n&\n|g' | sed -ne '/mirror/s|mirror://\([^/]*\)[^ ]*|\1|gp' | sort -u | xargs -i% grep '^%[[:space:]]' "$(paludis --configuration-variable gentoo location)"/profiles/thirdpartymirrors > "${1:-.}"/profiles/thirdpartymirrors
@@ -15,10 +19,6 @@ else
 fi
 eend
 
-ebegin "Generating categories"
-find "${1:-.}" -maxdepth 1 -mindepth 1 -type d -not -name licenses -not -name profiles -not -name '.*' | sed 's:^.*/::' | sort > "${1:-.}"/profiles/categories
-eend
-
 ebegin "Generating arch.list"
 if type -p paludis &>/dev/null; then
     find "${1:-.}" -name '*.ebuild' | sed 's|^\./\([^/]*\)/[^/]*\(/[^/]*\).ebuild$|=\1\2::'"$(<"${1:-.}"/profiles/repo_name)"'|' | xargs paludis -qM | grep '^[[:space:]]*KEYWORDS: ' | cut -d : -f 2- | sed -e 's/-\*//g' -e 's/\([[:space:]]\)[~-]/\1/g' -e 's/^[[:space:]]*//' -e 's/ /\n/g' | sort -u > "${1:-.}"/profiles/arch.list
diff --git a/app-portage/drizzt-scripts/files/gen_metadata b/app-portage/drizzt-scripts/files/gen_metadata
new file mode 100644
index 0000000..3f1af39
--- /dev/null
+++ b/app-portage/drizzt-scripts/files/gen_metadata
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2007 Timothy Redaelli <drizzt@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+function extract_metadata() {
+	while read i; do
+		KEY=${i%%=*}
+		VALUE=${i#*=}
+		eval "${KEY}"='${VALUE}'
+	done < "$1"
+
+	echo "${DEPEND}"
+	echo "${RDEPEND}"
+	echo "${SLOT}"
+	echo "${SRC_URI}"
+	echo "${RESTRICT}"
+	echo "${HOMEPAGE}"
+	echo "${LICENSE}"
+	echo "${DESCRIPTION}"
+	echo "${KEYWORDS}"
+	echo "${_eclasses_}" | awk '{for (i = 1; i <= NF - 3; i+=3) printf ("%s ", $i); print $i}'
+	echo "${IUSE}"
+	echo ""
+	echo "${PDEPEND}"
+	echo "${PROVIDE}"
+	echo "${EAPI:-0}"
+}
+
+portdir=$(portageq portdir)
+
+while read i; do
+	extract_metadata $i > ${portdir}/metadata/cache/${i#/var/cache/edb/dep${portdir}}
+done < <(find /var/cache/edb/dep"${portdir}" -type f)