Use `python_get_sitedir -f` instead of `python_get_sitedir` in src_prepare() (bug #300946).

Package-Manager: portage-15200-svn/cvs/Linux x86_64

4 files changed, 16 insertions, 22 deletions

diff --git a/www-apps/viewvc/ChangeLog b/www-apps/viewvc/ChangeLog
index 5ae7d3309e49..587bde662d24 100644
--- a/www-apps/viewvc/ChangeLog
+++ b/www-apps/viewvc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/viewvc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.42 2010/01/07 15:59:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/ChangeLog,v 1.43 2010/01/15 14:54:15 arfrever Exp $
+
+  15 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  viewvc-1.1.2.ebuild, viewvc-1.1.3.ebuild:
+  Use `python_get_sitedir -f` instead of `python_get_sitedir` in src_prepare()
+  (bug #300946).
 
   07 Jan 2010; Joseph Jezak <josejx@gentoo.org> viewvc-1.1.3.ebuild:
   Marked ppc stable for bug #298127.
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index 4f79281f31af..03a77bf065f6 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST viewvc-1.1.2.tar.gz 588066 RMD160 4edefe7ccf3feb0c21a133d794a93e788c8f2e21 SHA1 e4a112bf901adb29015ffb2047acd09b3b029bf4 SHA256 129a5b2b29cc720c089dd671c2ba9e7adaf6541a976de03aabaf0850b7100931
 DIST viewvc-1.1.3.tar.gz 593173 RMD160 ce20074f5a01d0bfd3223f12ccb4e9c824bb2d30 SHA1 0be1f4ccf3e831c86352e2ded6c5c48ae9af217a SHA256 d1a1d0602198fd0f38379c7c0e647532e8f8a1d267236d293227c125f39a001f
-EBUILD viewvc-1.1.2.ebuild 2546 RMD160 eddd29b8199a392ff8c6047d3625f44db4757eb3 SHA1 e376af0d8c5e2cb37a213ed9a286192bc5d4b490 SHA256 1341da3a3822fcd6c278c73fea8a047fb3a02a239c1c6b444fb0f1471cde0a23
-EBUILD viewvc-1.1.3.ebuild 2528 RMD160 8edae5daa6868ec9b399dfd08d49eb8e6d23475a SHA1 06da82900d187c57cd281fd1c99e8305f29e374e SHA256 006d6552127855bf394a6201fc6a4ed9fe4add5ea868c6337cc94a1908e622d5
-MISC ChangeLog 5287 RMD160 a210c85563fd12804d45ae2051f8fc8249e70d66 SHA1 6f48f1cf620d1a311c289f76a20d752046fe68e3 SHA256 a31946b170c26240d1af3eab8040ecf819fb2cc13527d2afacda49b6afbda814
+EBUILD viewvc-1.1.2.ebuild 2557 RMD160 bd769cf8bc7ae2933129e0f6660a5b7a57fd6d50 SHA1 330ccbc214624359ff49b2036147916cc4d6ffa2 SHA256 b806d6a61f9348c6800b3368c4862b9506fe02017c72a0804a6d5a9e5f77c10f
+EBUILD viewvc-1.1.3.ebuild 2533 RMD160 1a04add2ed65e074109a2fa7cc8b8d84d0282aad SHA1 540ca7317f7ff66264ba4f92c06e215dad13115e SHA256 37c399f86f28a7efe79c3627cabdee7de2a8b3275ba1b2989769d05bb7a3c976
+MISC ChangeLog 5503 RMD160 e641bbea84099cc74ed645a862fc82702cb889da SHA1 6482b2462bb8738ccb461b655aea7808719dc8c6 SHA256 5e6be55775aab01f108664ac1460265cf103defaeba8301dc27e05c7bf2dd7d8
 MISC metadata.xml 484 RMD160 5c0fa7acd5ec1eedda23ce6a0d6738064a9952ea SHA1 0359206773da56686eea748ad4ff6640f8c3b754 SHA256 6c7c15eaff5601bc1efbc9300f8f1b69be4aec6241cf167a0c93a61729e8e937
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktGBI8ACgkQcsIHjyDViGQNIQCfcs+cWWQv/WcQM9GqasbId8BD
-zdYAoLhy3JZPt1Ev0M66VboPYhaDGYBx
-=iJ04
------END PGP SIGNATURE-----
diff --git a/www-apps/viewvc/viewvc-1.1.2.ebuild b/www-apps/viewvc/viewvc-1.1.2.ebuild
index afdf99c95450..45f0bbd08e5d 100644
--- a/www-apps/viewvc/viewvc-1.1.2.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild,v 1.5 2009/09/24 18:55:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.2.ebuild,v 1.6 2010/01/15 14:54:15 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -37,8 +37,7 @@ RDEPEND="
 	mysql? ( >=dev-python/mysql-python-0.9.0 )
 	pygments? ( dev-python/pygments )
 "
-
-RESTRICT_PYTHON_ABIS="3*"
+RESTRICT_PYTHON_ABIS="3.*"
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -48,7 +47,7 @@ pkg_setup() {
 
 src_prepare() {
 	find bin/ -type f -print0 | xargs -0 sed -i \
-		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
+		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir -f)/${PN}\"|g" \
 		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g"
 
 	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
@@ -107,5 +106,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup viewvc
 }
diff --git a/www-apps/viewvc/viewvc-1.1.3.ebuild b/www-apps/viewvc/viewvc-1.1.3.ebuild
index abe732818723..9854f0bcbee9 100644
--- a/www-apps/viewvc/viewvc-1.1.3.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild,v 1.4 2010/01/07 15:59:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewvc/viewvc-1.1.3.ebuild,v 1.5 2010/01/15 14:54:15 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -47,7 +47,7 @@ pkg_setup() {
 
 src_prepare() {
 	find bin/ -type f -print0 | xargs -0 sed -i \
-		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
+		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir -f)/${PN}\"|g" \
 		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g"
 
 	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \