Use EAPI="4". Restrict Jython ABIs. Inherit only user.eclass for enewgroup() and enewuser(). Update HOMEPAGE. Use REQUIRED_USE. Backported from Progress Overlay. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 28 insertions, 31 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index 558c6a7bf782..5a8d401be08f 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/trac
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.123 2012/02/12 12:04:03 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.124 2012/03/16 02:44:26 floppym Exp $
+
+  16 Mar 2012; Mike Gilbert <floppym@gentoo.org> trac-0.12.3.ebuild:
+  Use EAPI="4". Restrict Jython ABIs. Inherit only user.eclass for enewgroup()
+  and enewuser(). Update HOMEPAGE. Use REQUIRED_USE. Backported from Progress
+  Overlay. Patch by Arfrever.
 
 *trac-0.12.3 (12 Feb 2012)
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index a25b447e2caf..a47e123596e6 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX postinst-en.txt 1349 RMD160 019db0eb917956b84e2afe621edcba501e83a105 SHA1 337a6d417aee1cb94d936952584a154a18ae6d74 SHA256 af9ea54a0499737a454852d8f878368fea6540dc50fce3ce486ede2a0a201a39
 AUX postupgrade-en.txt 674 RMD160 088b1b590ebd7876347b06e71f9dda549238eda1 SHA1 f45997b23c35eec1188003b21dd971d28961ab98 SHA256 4ce5f023f0f2312ac6b6162b2db510397d204cc168db1d5c09ad3aae678ea6b0
@@ -8,13 +8,13 @@ AUX tracd.initd 927 RMD160 0ecd5b36d4c79a13c885a7081cb94a8f4b38d21a SHA1 a2b95fd
 DIST Trac-0.12.2.tar.gz 2208361 RMD160 317d5792976bc4c048cbac2a831398e976251110 SHA1 95ca75b54abfd5a3d838f300c19ef8dbd125f08d SHA256 c5b41da9a2a1464f9f5a42f8624b3a9cf3cb96f8ffbbdb17bf3cb01b06280ec6
 DIST Trac-0.12.3.tar.gz 2239934 RMD160 f7d828952f3e693140711e83dc5b543442b015e8 SHA1 3d272d6802bd2591f2ae024f7beaafa26499816f SHA256 0eefacc5ebb91158ed7351b8f9b2eec7f45ce03b692bdc72a3c8061951174506
 EBUILD trac-0.12.2-r1.ebuild 2801 RMD160 98455158848634473ae3fce806d2a3d0c38c4ca2 SHA1 ea1a64ac58789fcf9a950cf51956700e3b618055 SHA256 a85d744c8b4e595202330c8c1e8b0118db2ec8ba3c31a1e30277e15d405f87d7
-EBUILD trac-0.12.3.ebuild 2774 RMD160 d0e5c2be2029c859072e62853cc343b66d76aa0c SHA1 2dd25cfad01cff358860f46c1c40d32027b06475 SHA256 2f19c14c4cf4702bea71e658817958827139ae55440737a6ddb8a65503f979d1
-MISC ChangeLog 18446 RMD160 723f276d2cbfe8f562f75457705ef71f103571c2 SHA1 d670a2e4022f16e805296b650604d94c69aaa465 SHA256 ecfeea8c2d20ac9d557134ad6ba9eac8b94a5301f4ac72fdfe7c29de3667282e
+EBUILD trac-0.12.3.ebuild 2543 RMD160 5ced396ce3653ad82014efa760e9ec46a602511c SHA1 31e2af31e75e720942baf2b8a54141ce4d09e377 SHA256 ccbd6808f53d69e35c563f632e40151e4e41f7a2f245c7686af27df944260e12
+MISC ChangeLog 18707 RMD160 e785b0a0135a16508034552acd85fdf382e4f72e SHA1 262913a4a2e050d9f3c34981f0e8bac8c0c6fddb SHA256 acb1e53f727eccacbaab35cbd2f2f868511499bc5e439bbbeee2e700fab63995
 MISC metadata.xml 353 RMD160 f4472ab9ab13edf764e019de289cd8658c8c9f41 SHA1 0d13970ae85fc0d2ebe0960ea78457b0b1da29c3 SHA256 12d6ceeed2212b5daf258a1dc4fee3fb6acd607e866e4062a907c157ac387059
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk83qrwACgkQxeMuLWsGW/sdpwCdG8wYIje0QjTG+gXYujsE4e1f
-KDwAn2+H7nrQ62eKbwSOKuRmdCUnGbZa
-=uMAi
+iF4EAREIAAYFAk9iqRAACgkQC77qH+pIQ6RNWQD+NwLoi2RAQ8OHSi9qPvypUaSD
+QLqqcW8nUAMYXa8PGeMA/385pZ/8Vv6iaMfUF5Jbmgy9JtFq8BDksfJSr4GFVP49
+=jZ4z
 -----END PGP SIGNATURE-----
diff --git a/www-apps/trac/trac-0.12.3.ebuild b/www-apps/trac/trac-0.12.3.ebuild
index c42d28d929af..1f26ca3919c8 100644
--- a/www-apps/trac/trac-0.12.3.ebuild
+++ b/www-apps/trac/trac-0.12.3.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.3.ebuild,v 1.1 2012/02/12 12:04:03 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.3.ebuild,v 1.2 2012/03/16 02:44:26 floppym Exp $
 
-EAPI="2"
+EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit distutils eutils webapp
+inherit distutils user webapp
 
 MY_PV=${PV/_beta/b}
 MY_P=Trac-${MY_PV}
-S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system."
-HOMEPAGE="http://trac.edgewall.com/"
-LICENSE="BSD"
+HOMEPAGE="http://trac.edgewall.com/ http://pypi.python.org/pypi/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
-IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# doing so because tools, python packages... overlap
+LICENSE="BSD"
 SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
 	dev-python/setuptools
@@ -43,24 +40,20 @@ RDEPEND="
 	subversion? ( dev-vcs/subversion[python] )
 	"
 DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
 	python_pkg_setup
 	webapp_pkg_setup
 
-	if ! use mysql && ! use postgres && ! use sqlite; then
-		eerror "You must select at least one database backend, by enabling"
-		eerror "at least one of the 'mysql', 'postgres' or 'sqlite' USE flags."
-		die "no database backend selected"
-	fi
-
 	enewgroup tracd
 	enewuser tracd -1 -1 -1 tracd
 }
 
 src_test() {
-
 	testing() {
 		PYTHONPATH=. "$(PYTHON)" trac/test.py
 	}
@@ -69,7 +62,6 @@ src_test() {
 	if use i18n; then
 		make check
 	fi
-
 }
 
 # the default src_compile just calls setup.py build
@@ -88,17 +80,17 @@ src_install() {
 	fowners tracd:tracd /var/lib/trac/egg-cache
 
 	# documentation
-	cp -r contrib "${D}"/usr/share/doc/${P}/
+	dodoc -r contrib
 
 	# tracd init script
 	newconfd "${FILESDIR}"/tracd.confd tracd
 	newinitd "${FILESDIR}"/tracd.initd tracd
 
 	if use cgi; then
-		cp cgi-bin/trac.cgi "${D}"/${MY_CGIBINDIR} || die
+		cp cgi-bin/trac.cgi "${ED}${MY_CGIBINDIR}" || die
 	fi
 	if use fastcgi; then
-		cp cgi-bin/trac.fcgi "${D}"/${MY_CGIBINDIR} || die
+		cp cgi-bin/trac.fcgi "${ED}${MY_CGIBINDIR}" || die
 	fi
 
 	for lang in en; do