Migrate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

3 files changed, 23 insertions, 55 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index e951a4156aea..fade33abf774 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/trac
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.84 2008/11/17 04:40:58 wrobel Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.85 2009/03/07 20:43:18 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> trac-0.11.2.ebuild:
+  Migrate to EAPI 2.
 
   17 Nov 2008; Gunnar Wrobel <wrobel@gentoo.org> -trac-0.10.5.ebuild:
   Removed vulnerable www-apps/trac-0.10.5 (sec issue #246130).
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 70f7f1711603..6f628fd1324f 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinst-en.txt 1349 RMD160 019db0eb917956b84e2afe621edcba501e83a105 SHA1 337a6d417aee1cb94d936952584a154a18ae6d74 SHA256 af9ea54a0499737a454852d8f878368fea6540dc50fce3ce486ede2a0a201a39
 AUX postupgrade-en.txt 674 RMD160 088b1b590ebd7876347b06e71f9dda549238eda1 SHA1 f45997b23c35eec1188003b21dd971d28961ab98 SHA256 4ce5f023f0f2312ac6b6162b2db510397d204cc168db1d5c09ad3aae678ea6b0
 AUX tracd.confd 359 RMD160 7328dd041576abbc76130ce220041d837289dd00 SHA1 91a6077f1baf9301082826697e8828c6039f7648 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e
 AUX tracd.initd 881 RMD160 c215a990133d5b655bc94e13ab4de9d1c938a163 SHA1 2c1a9dbae7e4890c2fb71f22091786ba7396c940 SHA256 6e76bfffe7f6928bff24d79b97aa8bbd27dafdfbb16fe8c79b7ad298e202d950
 AUX tracd.initd.2 939 RMD160 2991a7a8d2d1a2911a899ed5f356fd88de872b5d SHA1 c8d00dc0e7ca92f17caa4ec1dfa49d3178fbc735 SHA256 9cd796e0fb516a91f5ec69037819144e9b9920af5df4f91839f9fb7fc67823a0
 DIST Trac-0.11.2.tar.gz 715377 RMD160 33cc6c098517d09d912a5e72eda1f96d3d627f3e SHA1 96a5c3e7d35e799a640aa7a3360de776c6f85074 SHA256 6ef10a2ed9dbe68133ebea4504f1f4e78fb28d0ad86f048af8a12020ef8dcf35
-EBUILD trac-0.11.2.ebuild 3977 RMD160 d3cb051a711d6d3bdc0d685736611285faf0b544 SHA1 ede3cad1b08ccdc2bc5160b5c78d9a95a199e692 SHA256 b46aa874abe5d72319a033a7ea5d48b06ca8adff66b43a042903cf08fdf36873
-MISC ChangeLog 13811 RMD160 583ae9a56ab1d91f606d35a2871276ed81920ace SHA1 3447cbf81a4b37e76be225b1ac37762e27ce49d9 SHA256 6f5bd93a8a3b547b218828005b52f86ca96d53f35aa1f2a6b8188f8fb5ac43e3
+EBUILD trac-0.11.2.ebuild 2360 RMD160 ab871ce747d960d0fcec52512b2c5b0e194dd8e2 SHA1 6be15d9e56f46d16a8be0b24c57903d38beb885a SHA256 25476090e80ef6bd4dcd41c876bc94e1b28560bd5d32048c1e7ef6b639e98aee
+MISC ChangeLog 13910 RMD160 ffd73672bb3c324eaab45ec34222e337133881ee SHA1 7922791908d2fcd5b130f02761130c451bf17fd2 SHA256 c63291aa05cb10cdf252211e37f28a3b601a6c2e3a50fab7ddf1b3f676310d6b
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmy3MAACgkQcxLzpIGCsLTcNwCfa5SD+ebrM5ZP0Rh3mMvQBUTt
+834An0FI/DeHHFEx9rJh3/yE14nWkFEi
+=AkzF
+-----END PGP SIGNATURE-----
diff --git a/www-apps/trac/trac-0.11.2.ebuild b/www-apps/trac/trac-0.11.2.ebuild
index 374785b6902c..e44215c9f9f9 100644
--- a/www-apps/trac/trac-0.11.2.ebuild
+++ b/www-apps/trac/trac-0.11.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11.2.ebuild,v 1.3 2008/11/16 17:47:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11.2.ebuild,v 1.4 2009/03/07 20:43:18 betelgeuse Exp $
+
+EAPI="2"
 
 inherit distutils webapp
 
@@ -48,46 +50,16 @@ RDEPEND="
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
 		|| (
-			>=dev-lang/python-2.5
+			>=dev-lang/python-2.5[sqlite]
 			>=dev-python/pysqlite-2.3.2
 		)
 	)
 	subversion? (
-		>=dev-util/subversion-1.4.2
+		>=dev-util/subversion-1.4.2[python]
 	)
 	!www-apps/trac-webadmin
 	"
 
-# The following function should be added to eutils.eclass (see bug #143572):
-
-# Generate an standard error message for missing USE flags
-# in existing packages, and die.
-#
-# Usage: built_with_use_die <category/package> <functionality> [<USE flag>]
-#    ex: built_with_use_die dev-util/subversion python
-#    or: built_with_use_die www-servers/apache LDAP ldap
-#
-# Typical usage:
-#	if ! built_with_use dev-util/subversion python ; then
-#        built_with_use_die dev-util/subversion python
-#   fi
-#
-# Note: when <USE flag> is not specified, <functionality> is used for the USE flag name.
-built_with_use_die() {
-	local package=$1
-	local func=$2
-	local use_flag=$3
-
-	[[ -z ${use_flag} ]] && use_flag=${func}
-
-	eerror "Your ${package} package has been built without"
-	eerror "${func} support, please enable the '${use_flag}' USE flag and"
-	eerror "re-emerge ${package}."
-	elog "You can enable this USE flag either globally in /etc/make.conf,"
-	elog "or just for specific packages in /etc/portage/package.use."
-	die "${package} missing ${func} support"
-}
-
 pkg_setup() {
 	webapp_pkg_setup
 
@@ -97,23 +69,6 @@ pkg_setup() {
 		die "no database backend selected"
 	fi
 
-	# python has built-in sqlite support starting from 2.5
-	if use sqlite && \
-		has_version ">=dev-lang/python-2.5" && \
-		! has_version ">=dev-python/pysqlite-2.3" && \
-		! built_with_use dev-lang/python sqlite ; then
-		eerror "To use the sqlite database backend, you must either:"
-		eerror "- build dev-lang/python with sqlite support, using the 'sqlite'"
-		eerror "  USE flag, or"
-		eerror "- emerge dev-python/pysqlite"
-		die "missing python sqlite support"
-	fi
-
-	if use subversion && \
-		! built_with_use dev-util/subversion python ; then
-		built_with_use_die dev-util/subversion python
-	fi
-
 	enewgroup tracd
 	enewuser tracd -1 -1 -1 tracd
 }