Bug #283732: Perl module should be installed to vendor_perl instead of site_perl.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

11 files changed, 126 insertions, 65 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index e92018e30225..3db3fd3b3935 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.359 2009/09/16 01:37:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.360 2009/09/16 03:42:14 robbat2 Exp $
+
+  16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.3.1.ebuild,
+  git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild,
+  git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild,
+  git-1.6.5_rc1.ebuild, git-9999.ebuild:
+  Bug #283732: Perl module should be installed to vendor_perl instead of
+  site_perl.
 
   16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.3.1.ebuild,
   git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild,
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 678e1035e775..f1b8e7444bef 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -26,14 +26,14 @@ DIST git-manpages-1.6.4.2.tar.bz2 248508 RMD160 80aac9a3bef03ca9973ab3e7dd03cd02
 DIST git-manpages-1.6.4.3.tar.bz2 248228 RMD160 27699b3d7a5e2088099c7695e3f4d1214c6f5ed8 SHA1 3186ed5a5e14496842c8389b4a3704c57a7e9569 SHA256 99489e55548dd1898d866bdc90dc94942396eebf42dde0d446f1eb7195c83d29
 DIST git-manpages-1.6.4.tar.bz2 246610 RMD160 0b008edd9b120a82973a7caed380e2a13f4af478 SHA1 34c8afef3e03283585edb1093b517f697f18a47b SHA256 b7ed025920594dff4ab9dc959bbefd99fa4ce3ebadef81fc92aad4d66065b7d5
 DIST git-manpages-1.6.5.rc1.tar.bz2 252098 RMD160 6e7b2b6c78c494c2c4e6ba5fff1c6af26dbd588e SHA1 ca612c39d80b4e7b6629c15f99923a1a35ed99c0 SHA256 bb8e6b08ae70449aca656e81afd12946889757c5bfa8cfc989d6919cf5ce4b17
-EBUILD git-1.6.3.1.ebuild 9759 RMD160 ad0eeb93aca2607cb837a515f909a27b3fac4e32 SHA1 aba5593251f4eb021d3f013a546f7153254cc150 SHA256 b6ee8483b21002ae0911e5a96ed8709d358a935d864e8ceb104879afd03d9f1d
-EBUILD git-1.6.3.3.ebuild 9749 RMD160 b3d9fdc75745443beafc9d549062c54d7a36bad5 SHA1 6def0a79149e24839c1a86bf48036c3849bfdff5 SHA256 7a577373ddb46386977454ba4d29e4ed220ad44d13906a530f012cdd2d7f5d2f
-EBUILD git-1.6.3.4.ebuild 9759 RMD160 6b6254ec59ebc1e57414131565fd6e5b53bd7cc4 SHA1 b87ca91540c29ca23316544c5873958a80b47874 SHA256 35d6208d38816844c8a71d65573f9bb0ff12ab61683aa76ca87b1d924485b2c5
-EBUILD git-1.6.4.1.ebuild 9759 RMD160 8592e311b6062b7641cecbdbbf0f2289e1299985 SHA1 01543dbb5aa086335cdca8767d0eead4db157bf5 SHA256 0e69d61c1d8668a583e83e0721ff12235e91d7b45a177d7b03f41d4f97c1eded
-EBUILD git-1.6.4.2.ebuild 9759 RMD160 209bd2d6928b132faf9cad6d12092047874fff90 SHA1 33b3b24b276a6590420e9b5d2965741cab566ac9 SHA256 835149dc1b1b4dea78fe3c9a4974e408b81eb6ffeb974168d3fc12e3ec52ba0b
-EBUILD git-1.6.4.3.ebuild 9759 RMD160 a51aef14e132813e695c0c304afb2bf464250ea1 SHA1 17f1ef6d0fefc7a1b14231e5502d7ffb50727f99 SHA256 77c8240aa428306ad5e4e15779510032946d2699cf2757d2ba99c00353622dd9
-EBUILD git-1.6.4.ebuild 9757 RMD160 a49f12b1fb66b553d4197b7c62a7d74002e01566 SHA1 c5727ed515d61c499d66498c2a659191b6c4bb80 SHA256 036b65069194f63ecd4c41a36e4e2ad6134cd91f581205227e98be9e45d68679
-EBUILD git-1.6.5_rc1.ebuild 9761 RMD160 4b1f4d21c6898d55a4a69a93202ac65d2e5a1223 SHA1 bcc503bf37c01f6c182ab50d112ac6db817cffa9 SHA256 24c00c9478bfbb99291b675034c21447adbfbd0f6a1bb58d1bbfee2f2522b5b8
-EBUILD git-9999.ebuild 9674 RMD160 fc1da97db9b90528c7ee44b14d08d690b1acff53 SHA1 7728c80dd9093fc852d90af6a0b9027df25c4a23 SHA256 51de25bf53475ebaf9cdc92bf8b586e7cd366d4d9ae44c2645ef79ebafe2c5ab
-MISC ChangeLog 55167 RMD160 aa5093bab30e17a15fac27dd46215bb5e78125a4 SHA1 df5508d7e57dd157a02f78df15077a399cab77d3 SHA256 12965e4ea4e5b50806eb80ad1071e5db489964d508d8ee00e8fa50851ec33c4b
+EBUILD git-1.6.3.1.ebuild 9822 RMD160 efb610a643dfb7012cdcfe7b004be21df9959c2e SHA1 7d9bdd8feab1d9583e7d11a969b04e5af7dadc2a SHA256 02b755e3187c2120e330b50dd75464cb5da3ee9ff7a209f1beca6b451c4efdb5
+EBUILD git-1.6.3.3.ebuild 9812 RMD160 b02a82068e2f6212c9233a70454c2705eed09cbf SHA1 711efefb7245ba3dcf922588328c69c823e45ac0 SHA256 b04dc5ba8fca00d25e60d0a275bff002d93017b0710ed1232ea18dad6b39d12c
+EBUILD git-1.6.3.4.ebuild 9822 RMD160 b7b845e4472fa2158a9138fdf5b7ff960690f9c0 SHA1 6ef86a16b277aff1b7944b90921554db03bfd589 SHA256 d91d927d602e062bae19da87ff671ebc09314b6bf2fdf9eeee98ce170e155c36
+EBUILD git-1.6.4.1.ebuild 9822 RMD160 f22fe274b3333b401210627dd76c222a962256da SHA1 1f113f013a3ee67da29ec8c6a5a0fbece0f1c5c1 SHA256 706707790c856cd54f3b3ad6a5dec9d81fd787c4be6c3c7ac84a26e0b25b5c4e
+EBUILD git-1.6.4.2.ebuild 9822 RMD160 51dd8718c505470946d6c5bcba990c395f1b5f5e SHA1 f5916aac5b0879bfdb46894478e80f2f0946e8b8 SHA256 730dd751614b38a4ad395de0ddb94fa7a75b3af26f7c86fa173f30d3045b3ea8
+EBUILD git-1.6.4.3.ebuild 9822 RMD160 54b6f4adad0b3bc0f51207750c733b92374672c4 SHA1 4b15d4ff175108396db5ba2d99db56cdaf031d09 SHA256 63a68c88629c1062e6572db4972f8f686762f09800a0c25939ab6fe12b716e7d
+EBUILD git-1.6.4.ebuild 9820 RMD160 c05566197a263af27723459d96340fb1ab52f11c SHA1 9543ff97425fa9250f223b2a835e90240d890316 SHA256 119e2f65242d1a52f129ca5a6eb290c6b7cb87fdf88b998d39f59322daf5f6c6
+EBUILD git-1.6.5_rc1.ebuild 9824 RMD160 eda5f60e9e2e80401b7b1a2de2481614267c01e0 SHA1 5463470b2949065bdfe6edb92526403e260e383b SHA256 0f62aed72b1eff6132ffd65d29f6e78740643f5cba388fc123532cd67cba1c51
+EBUILD git-9999.ebuild 9737 RMD160 5b9ad265c133d8d5fcacae7b5546c00f9662ef76 SHA1 d43efa997cedd5ad32bfff0bd192062ae8f2828c SHA256 7428a0e19ea98b129b9388bd551bffb50218229dea794de6eed3302d0c2188d9
+MISC ChangeLog 55490 RMD160 fb913c823dddefe73ba0356c5ccf7a0b17162006 SHA1 24ad82769c975bef048190f1e5ce9e4875237218 SHA256 155ca4a43a942147ec19cba60a4e603bfc7951955849b21a9a4a901c418d8eac
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/git-1.6.3.1.ebuild b/dev-util/git/git-1.6.3.1.ebuild
index 3f162808c861..cde463b29864 100644
--- a/dev-util/git/git-1.6.3.1.ebuild
+++ b/dev-util/git/git-1.6.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.1.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.1.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.3.3.ebuild b/dev-util/git/git-1.6.3.3.ebuild
index f19f040a25e4..7f29617b9c6e 100644
--- a/dev-util/git/git-1.6.3.3.ebuild
+++ b/dev-util/git/git-1.6.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.3.ebuild,v 1.10 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.3.ebuild,v 1.11 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.3.4.ebuild b/dev-util/git/git-1.6.3.4.ebuild
index c654520bd3b6..0f59065f74a3 100644
--- a/dev-util/git/git-1.6.3.4.ebuild
+++ b/dev-util/git/git-1.6.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.4.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.4.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.4.1.ebuild b/dev-util/git/git-1.6.4.1.ebuild
index 0e9bdf291dd1..fddd039768ea 100644
--- a/dev-util/git/git-1.6.4.1.ebuild
+++ b/dev-util/git/git-1.6.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.1.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.1.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.4.2.ebuild b/dev-util/git/git-1.6.4.2.ebuild
index fa5564fda73c..fab26b0ab838 100644
--- a/dev-util/git/git-1.6.4.2.ebuild
+++ b/dev-util/git/git-1.6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.2.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.2.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.4.3.ebuild b/dev-util/git/git-1.6.4.3.ebuild
index ae8b4d9ecf79..b3b3adbd479a 100644
--- a/dev-util/git/git-1.6.4.3.ebuild
+++ b/dev-util/git/git-1.6.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.3.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.3.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.4.ebuild b/dev-util/git/git-1.6.4.ebuild
index 58a8243e552e..9d7a35e73f95 100644
--- a/dev-util/git/git-1.6.4.ebuild
+++ b/dev-util/git/git-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-1.6.5_rc1.ebuild b/dev-util/git/git-1.6.5_rc1.ebuild
index 692358e6f896..fe29b2c22817 100644
--- a/dev-util/git/git-1.6.5_rc1.ebuild
+++ b/dev-util/git/git-1.6.5_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5_rc1.ebuild,v 1.4 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5_rc1.ebuild,v 1.5 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }
diff --git a/dev-util/git/git-9999.ebuild b/dev-util/git/git-9999.ebuild
index b9f470194f44..d3341a053f2b 100644
--- a/dev-util/git/git-9999.ebuild
+++ b/dev-util/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.10 2009/09/16 02:00:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.11 2009/09/16 03:42:14 robbat2 Exp $
 
 EAPI=2
 
@@ -106,11 +106,17 @@ exportmakeopts() {
 		myopts="${myopts} NO_CURL=YesPlease"
 	fi
 
-	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-	use perl || myopts="${myopts} NO_PERL=YesPlease"
-	use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-	use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
 
 	export MY_MAKEOPTS="${myopts}"
 }