Oops

svn path=/; revision=106

3 files changed, 21 insertions, 14 deletions

diff --git a/app-portage/drizzt-scripts/ChangeLog b/app-portage/drizzt-scripts/ChangeLog
index 44e8d7f..e89668f 100644
--- a/app-portage/drizzt-scripts/ChangeLog
+++ b/app-portage/drizzt-scripts/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   26 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
+  Oops
+
+  26 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
   Add missing digest
 
   26 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
diff --git a/app-portage/drizzt-scripts/Manifest b/app-portage/drizzt-scripts/Manifest
index adbd40a..e1bb234 100644
--- a/app-portage/drizzt-scripts/Manifest
+++ b/app-portage/drizzt-scripts/Manifest
@@ -5,10 +5,10 @@ AUX ecommit 1164 RMD160 9ea549b7e8d8612033ca6e0defe18c4cd5f8a2b7 SHA1 3415e5bd36
 MD5 757cacc68de818c421b48b866b9e0411 files/ecommit 1164
 RMD160 9ea549b7e8d8612033ca6e0defe18c4cd5f8a2b7 files/ecommit 1164
 SHA256 7a5c161cfeced36539727fc13aa0345543220a1b7a26a63d9a60e8059497a98c files/ecommit 1164
-AUX fix_overlay 1454 RMD160 06ae5b884d22c08e44567feb01d7fe75db2b2a0e SHA1 0b8e690750d48c20e0410e617ea05c72bd5e5486 SHA256 55cc490ef3bbc12f033271a639490e65e9ef47f87048758821db61339b92022c
-MD5 97c3429d9b73c03b56862ae76b46f6c2 files/fix_overlay 1454
-RMD160 06ae5b884d22c08e44567feb01d7fe75db2b2a0e files/fix_overlay 1454
-SHA256 55cc490ef3bbc12f033271a639490e65e9ef47f87048758821db61339b92022c files/fix_overlay 1454
+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 rdep 2647 RMD160 46e799298a9eec70ec121695e83651fd9c7150f6 SHA1 d6e31cb976ef7ff9bce7ae79d5e4d200ce552a8b SHA256 c03a200bb20a18898464881a7bbb563ee5bc1c768764e4e275e0dcef9322865e
 MD5 31f93266c9b232fb245557d968d99e0d files/rdep 2647
 RMD160 46e799298a9eec70ec121695e83651fd9c7150f6 files/rdep 2647
@@ -18,17 +18,17 @@ EBUILD drizzt-scripts-1.0-r1.ebuild 557 RMD160 a57f8b711e1170f97aa8020bf05031f75
 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
-MISC ChangeLog 572 RMD160 56feca149010a1f078abdc941e416271631e3ea3 SHA1 e79fdace9a222e89016dda45d0bdc89b0a13d889 SHA256 51db3ca8d414b763afdff87e708bf6d178ba51ab7f05ba1a5c4e50c8e17c3bdc
-MD5 80ba2aac7f228e6febb9c70c8a901203 ChangeLog 572
-RMD160 56feca149010a1f078abdc941e416271631e3ea3 ChangeLog 572
-SHA256 51db3ca8d414b763afdff87e708bf6d178ba51ab7f05ba1a5c4e50c8e17c3bdc ChangeLog 572
+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)
 
-iD8DBQFF4uO1GDyatLGpTbYRAtQCAKCFTlNb1eL+RD+WFE9HgEUaLMiPuACgkWnr
-H7fCJm6z+YsTs107rSAvrQY=
-=mmG1
+iD8DBQFF4ugKGDyatLGpTbYRAvaWAJ99T+cTwtsB/i+nATa8ZnvZyTUXYACfS4pE
+Ms00xw+xN0bDyxXhvbL1YQc=
+=nRvK
 -----END PGP SIGNATURE-----
diff --git a/app-portage/drizzt-scripts/files/fix_overlay b/app-portage/drizzt-scripts/files/fix_overlay
index b2faa3e..286579a 100644
--- a/app-portage/drizzt-scripts/files/fix_overlay
+++ b/app-portage/drizzt-scripts/files/fix_overlay
@@ -9,16 +9,20 @@ fi
 
 ebegin "Generating thirdpartymirrors"
 if type -p paludis &>/dev/null; then
-    fgrep -lr --include '*.ebuild' mirror:// "${1:-.}" | 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
+    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
 else
     fgrep -r --include '*.ebuild' mirror:// "${1:-.}" | sed 's|^.*mirror://\([^/]*\).*|\1|' | sort -u | xargs -i% grep '^%[[:space:]]' "$(portageq portdir)"/profiles/thirdpartymirrors > "${1:-.}"/profiles/thirdpartymirrors
 fi
 eend
 
 ebegin "Generating categories"
-find "${1:-.}" -maxdepth 1 -mindepth 1 -type d -not -name profiles -not -name '.*' | sed 's:^.*/::' | sort > "${1:-.}"/profiles/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"
-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
+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
+else
+    fgrep -hr --include '*.ebuild' KEYWORDS . | awk -F \" '{print " " $2}' | sed -e 's/-\*//g' -e 's/\([[:space:]]\)[~-]/\1/g' -e 's/^[[:space:]]*//' -e 's/ /\n/g' | sort -u > "${1:-.}"/profiles/arch.list
+fi
 eend