Added a check for clearsilver being built with USE=python. Resolves bug #143572.

Package-Manager: portage-2.1.1_pre4-r2

3 files changed, 30 insertions, 16 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 3637f498b2e5..769b2b2ca05d 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/trac
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.39 2006/07/13 18:19:15 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.40 2006/08/11 14:30:09 betelgeuse Exp $
+
+  11 Aug 2006; Petteri Räty <betelgeuse@gentoo.org> trac-0.9.6.ebuild:
+  Added a check for clearsilver being built with USE=python. Resolves bug
+  #143572.
 
   13 Jul 2006; Joshua Jackson <tsunam@gentoo.org> trac-0.9.6.ebuild:
   stable x86; security bug #139467
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 2bb344c02007..f49cbb8eae05 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -23,14 +23,14 @@ EBUILD trac-0.9.5.ebuild 2706 RMD160 ad75382046264d3a42b33fd00ff8305d865f4a25 SH
 MD5 106a9f94e78c56bca94a3e6434680ecf trac-0.9.5.ebuild 2706
 RMD160 ad75382046264d3a42b33fd00ff8305d865f4a25 trac-0.9.5.ebuild 2706
 SHA256 16e442b7c412d109abff836845b2414b3b484a03e071079440abd84ca615ce8a trac-0.9.5.ebuild 2706
-EBUILD trac-0.9.6.ebuild 2770 RMD160 3a4a8b0c24ca64ac34744db8a42d892831a1c3be SHA1 542df07520c496750a950e5bd6a2a65465755964 SHA256 d1ac252d2082bf394c7f310b964ce17f683de972a811db37839d74e4354911b4
-MD5 9fa0c1ef3106be59fc8a728a758366e8 trac-0.9.6.ebuild 2770
-RMD160 3a4a8b0c24ca64ac34744db8a42d892831a1c3be trac-0.9.6.ebuild 2770
-SHA256 d1ac252d2082bf394c7f310b964ce17f683de972a811db37839d74e4354911b4 trac-0.9.6.ebuild 2770
-MISC ChangeLog 7422 RMD160 6241b0cb802c2671e0c926bf5d3011d5ac7ef6ef SHA1 06528b09f7484d662cb92f469b08c5b2b003ca4f SHA256 255e17e22a3b8a42bd395211d6e53dab671ae2962e7bccb2e5e4b4ab19639698
-MD5 4be8e4fa36489b745adfc81b435a58e6 ChangeLog 7422
-RMD160 6241b0cb802c2671e0c926bf5d3011d5ac7ef6ef ChangeLog 7422
-SHA256 255e17e22a3b8a42bd395211d6e53dab671ae2962e7bccb2e5e4b4ab19639698 ChangeLog 7422
+EBUILD trac-0.9.6.ebuild 3165 RMD160 78552ad73e99e2c01d4e1f15dc087f36886240e1 SHA1 551dc24435df81e920cca85d3a4028431c4cef6a SHA256 cea05e5c55f86c74c2a7c42ffe7b7b2febb8347a68a424abed7ffa8fc26bd548
+MD5 99851d8e651b9abf1d55afdf9fd418bd trac-0.9.6.ebuild 3165
+RMD160 78552ad73e99e2c01d4e1f15dc087f36886240e1 trac-0.9.6.ebuild 3165
+SHA256 cea05e5c55f86c74c2a7c42ffe7b7b2febb8347a68a424abed7ffa8fc26bd548 trac-0.9.6.ebuild 3165
+MISC ChangeLog 7584 RMD160 f27b5f2340eef942cc85a0924cb39624cfa7e61f SHA1 4feb82eca0e247a2b24e02e5c6e22059874f6afd SHA256 7f0c2e85fcb285a3febc4c85c010d061a0c84100924ccb43b22d3bd990d6cd0c
+MD5 f155fa88b6b016a4aac6b2cc19f873dc ChangeLog 7584
+RMD160 f27b5f2340eef942cc85a0924cb39624cfa7e61f ChangeLog 7584
+SHA256 7f0c2e85fcb285a3febc4c85c010d061a0c84100924ccb43b22d3bd990d6cd0c ChangeLog 7584
 MISC metadata.xml 220 RMD160 dcc7b97d4b6eb6a017014b427fa9fd9c2ce04583 SHA1 2cf693a9408713395fdedb16da9edd6b33e5c2e7 SHA256 09bece3580791397bbf0b4d68ff9ac4abbc37150cf11fe7848f924119ca76b84
 MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
 RMD160 dcc7b97d4b6eb6a017014b427fa9fd9c2ce04583 metadata.xml 220
@@ -42,9 +42,9 @@ MD5 ef7e6e6a4bfbbaa52235699344830326 files/digest-trac-0.9.6 232
 RMD160 7e8faa5459569fc27f03dc441c9d7b9c34e00d9b files/digest-trac-0.9.6 232
 SHA256 a44608e686cc8466aa7c2fe9a8722b43bb7b4c2436e032801b02703c27820742 files/digest-trac-0.9.6 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEto7K2ZWR0Jhg/EsRAoRFAJ9JXFT+FGzg6Cc4cHxg4itDi11blQCfXmvU
-SHBNMQzfTZqvl1yaTvpd6P4=
-=Ir/a
+iD8DBQFE3JSLcxLzpIGCsLQRAvX3AKCd6Jmcqz87OvzEMLjdHrK5akJGpQCbBH9Y
+FC5E4+ASvFYVLrkC56ehphU=
+=0vb+
 -----END PGP SIGNATURE-----
diff --git a/www-apps/trac/trac-0.9.6.ebuild b/www-apps/trac/trac-0.9.6.ebuild
index 170f34a39313..e94bcfbe9a9d 100644
--- a/www-apps/trac/trac-0.9.6.ebuild
+++ b/www-apps/trac/trac-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9.6.ebuild,v 1.3 2006/07/13 18:19:15 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.9.6.ebuild,v 1.4 2006/08/11 14:30:09 betelgeuse Exp $
 
 inherit distutils webapp
 
@@ -45,6 +45,16 @@ pkg_setup () {
 		die "pkg_setup failed"
 	fi
 
+	if ! built_with_use dev-libs/clearsilver python ; then
+		eerror "Your clearsilver has been built without python bindings,"
+		eerror "please enable the 'python' useflag and recompile"
+		eerror "dev-libs/clearsilver."
+		eerror ""
+		eerror "See the Handbook for more information about use flags:"
+		eerror "http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=2&chap=2"
+		die "clearsilver built without python support"
+	fi
+
 	ebegin "Creating tracd group and user"
 	enewgroup tracd
 	enewuser tracd -1 -1 -1 tracd
@@ -86,6 +96,6 @@ src_install () {
 
 	webapp_src_install
 
-	cp ${FILESDIR}/tracd.confd ${T}/tracd && doconfd ${T}/tracd
-	cp ${FILESDIR}/tracd.initd ${T}/tracd && doinitd ${T}/tracd
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
 }