www-apps/trac: Drop test USE flag and :0 in DEPEND following https://bugs.gentoo.org/show_bug.cgi?id=482034#c30

Package-Manager: portage-2.2.10

4 files changed, 22 insertions, 50 deletions

diff --git a/metadata/md5-cache/www-apps/trac-1.0.1 b/metadata/md5-cache/www-apps/trac-1.0.1
index 2c6c5e61..81cfcac3 100644
--- a/metadata/md5-cache/www-apps/trac-1.0.1
+++ b/metadata/md5-cache/www-apps/trac-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/docutils:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/genshi:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pygments:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pytz:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) cgi? ( virtual/httpd-cgi:0 ) fastcgi? ( virtual/httpd-fastcgi:0 ) mysql? ( dev-python/mysql-python:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion:0[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) test? ( dev-python/twill:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/lxml:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/configobj:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=app-admin/webapp-config-1.50.15
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/genshi[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pytz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Trac is a minimalistic web-based project management, wiki and bug/issue tracking system.
 EAPI=5
 HOMEPAGE=http://trac.edgewall.com/ http://pypi.python.org/pypi/Trac
-IUSE=cgi fastcgi i18n mysql postgres +sqlite subversion test python_targets_python2_7 python_single_target_python2_7 vhosts
+IUSE=cgi fastcgi i18n mysql postgres +sqlite subversion python_targets_python2_7 python_single_target_python2_7 vhosts
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=BSD
-RDEPEND=dev-python/setuptools:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/docutils:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/genshi:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pygments:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pytz:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) cgi? ( virtual/httpd-cgi:0 ) fastcgi? ( virtual/httpd-fastcgi:0 ) mysql? ( dev-python/mysql-python:0[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion:0[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=app-admin/webapp-config-1.50.15
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/genshi[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pytz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz
 _eclasses_=distutils-r1	d61b71d755b28b460ed7f8a20d3cf8b6	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	52284f64cfc64a6d70bc00a9f5a01c6f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=56185f55e8c840a250d7c083e53a75b9
+_md5_=910afb2a7a03b7fa04e62d64e279a112
diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index fc119c10..ce32e569 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,3 +1,7 @@
+  15 May 2014; Bertrand Jacquin <beber@meleeweb.net> trac-1.0.1.ebuild:
+  www-apps/trac: Drop test USE flag and :0 in DEPEND following
+  https://bugs.gentoo.org/show_bug.cgi?id=482034#c30
+
   27 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> trac-1.0.1.ebuild:
   www-apps/trac: Drop python-2.6 support
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 27265b78..b09f2bb1 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -18,6 +18,6 @@ AUX trac-1.0.1-changeset_12275.diff 5479 SHA256 ecab1fcebb9ac61174d2741cbad2dba7
 AUX tracd.confd 359 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e WHIRLPOOL 591394e732d39bc13f97004cfb3c18128aa16a55557172d872797b5ca5c69e5f15d1420e697a4e40215b2a893ed684ba6b6388abacd97874fd6f04953b579e1a
 AUX tracd.initd 919 SHA256 21a2f301ec584917628a62a0809b9603a5f0b460f902b23b3867174a710bb132 WHIRLPOOL 06fc2a8833786d86821180d010de4b69fbc9eeee0c7bafd4c7ab77599740f84caec1b6bbde79ab6349100da21e246a0cf05dd1a767fafae75d02f2c8c058ebb9
 DIST Trac-1.0.1.tar.gz 3479896 SHA256 9dd49065696a8d4dfcb1a1af81e51d6bd487f5a1e72b3325c1fe4ecb5c490adb WHIRLPOOL c795fab244c42752e1c7d2a0e488b1c062333a6de01e607b749271f0124c16746b55ad35a69b6844db272f7223179d6f29f9115abb5289f6af1bdf467394b1a5
-EBUILD trac-1.0.1.ebuild 3490 SHA256 5ae90f162fe4226d10747bba5247794c5337b25e69affba21fb0fc0a95e0525d WHIRLPOOL 44c25274ea9735a676e563c56e542dbcbe66b54cb18658387e0d0dde2649f0b4145b395e33e1968d80403c9fa4fb6791b7c19e0920f83765f5eb88df5e0bb330
-MISC ChangeLog 2852 SHA256 2246ac3a3f9d61db4741191af1166446bf71bdcc2a9430753d5df039513e2a1a WHIRLPOOL c738882e97784d6ba0002cb671d7b06fd21269ceb60ef55814be2935f35e8ba71a5f726818f0efe94dc9025e29ece2d4875da4a258956d87599348c6e5fd7939
+EBUILD trac-1.0.1.ebuild 2390 SHA256 031f547f372fb5d58e0adbdd7b5d74fb41e6151c61288be7f4f01f316ac8703f WHIRLPOOL 88ea0cc35dd94b657a70b56eb2030f75d49446f8eba97a4351ec42ca37393f63d784df3982b3cfcf25ca6770ed59239ad6b2109e6e8c7ff9c521ff8cd59a4912
+MISC ChangeLog 3041 SHA256 2a5afebd8bd312b23f20d322b625a0775c84dad9da16342cec89efd090fb3857 WHIRLPOOL 887b480f396ce086c8b080c12c99adebc9baa52eda1f982a5c92ada14aec8206cbf088f846b7a6b5e358df41198ce45d942c6e9274e6c85a216ca545c6b6fb85
 MISC metadata.xml 375 SHA256 78fb655170713d45b48caf62f60ed1ec424aeb74fbd905f4b81595824ea456c7 WHIRLPOOL 051cbc8a2631a997006e63ea42639a4ece76b390c857bb771bf1061b950c4b876fa7e13c369800bac9f72bd5cdc62cde09a843a232369ceb2f188e2868c24f34
diff --git a/www-apps/trac/trac-1.0.1.ebuild b/www-apps/trac/trac-1.0.1.ebuild
index 6c7d311c..6bc9102a 100644
--- a/www-apps/trac/trac-1.0.1.ebuild
+++ b/www-apps/trac/trac-1.0.1.ebuild
@@ -21,29 +21,24 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion test"
+IUSE="cgi fastcgi i18n mysql postgres +sqlite subversion"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-python/setuptools:0[${PYTHON_USEDEP}]
-	dev-python/docutils:0[${PYTHON_USEDEP}]
-	dev-python/genshi:0[${PYTHON_USEDEP}]
-	dev-python/pygments:0[${PYTHON_USEDEP}]
-	dev-python/pytz:0[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5:0[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi:0 )
-	fastcgi? ( virtual/httpd-fastcgi:0 )
-	mysql? ( dev-python/mysql-python:0[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion:0[python,${PYTHON_USEDEP}] )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
 	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/twill:0[${PYTHON_USEDEP}]
-		dev-python/lxml:0[${PYTHON_USEDEP}]
-		dev-python/configobj:0[${PYTHON_USEDEP}]
-	)"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -57,33 +52,6 @@ pkg_setup() {
 	enewuser tracd -1 -1 -1 tracd
 }
 
-src_prepare() {
-	# http://trac.edgewall.org/ticket/11290
-	epatch "${FILESDIR}/${P}-changeset_11684.diff"
-	epatch "${FILESDIR}/${P}-changeset_11689.diff"
-	epatch "${FILESDIR}/${P}-changeset_11690.diff"
-	epatch "${FILESDIR}/${P}-changeset_11691.diff"
-	epatch "${FILESDIR}/${P}-changeset_11712.diff"
-	epatch "${FILESDIR}/${P}-changeset_11769.diff"
-	epatch "${FILESDIR}/${P}-changeset_11771.diff"
-	epatch "${FILESDIR}/${P}-changeset_11773.diff"
-	epatch "${FILESDIR}/${P}-changeset_11776.diff"
-	epatch "${FILESDIR}/${P}-changeset_11783.diff"
-	epatch "${FILESDIR}/${P}-changeset_11816.diff"
-	epatch "${FILESDIR}/${P}-changeset_11876.diff"
-	epatch "${FILESDIR}/${P}-changeset_11892.diff"
-	epatch "${FILESDIR}/${P}-changeset_11893.diff"
-	epatch "${FILESDIR}/${P}-changeset_12275.diff"
-}
-
-python_test() {
-	echo ".python = ${EPYTHON}" > Makefile.cfg
-
-	emake testopts="-v" unit-test
-	emake testopts="-v" functional-test
-	emake testopts="-v" test-wiki
-}
-
 # the default src_compile just calls setup.py build
 # currently, this switches i18n catalog compilation based on presence of Babel
 src_install() {