www-apps/trac: Version bump, sync with upstream

Package-Manager: portage-2.2.14

4 files changed, 22 insertions, 16 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index b86f466e..60a024b6 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,3 +1,9 @@
+*trac-1.0.4 (08 Feb 2015)
+
+  08 Feb 2015; Bertrand Jacquin <bertrand@jacquin.bzh> +trac-1.0.4.ebuild,
+  -trac-1.0.3.ebuild, metadata.xml:
+  www-apps/trac: Version bump, sync with upstream
+
 *trac-1.0.3 (03 Feb 2015)
 
   03 Feb 2015; Bertrand Jacquin <bertrand@jacquin.bzh> +trac-1.0.3.ebuild,
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 0a54f383..d0390830 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -2,7 +2,7 @@ AUX postinst-en.txt 1331 SHA256 1799cf63e70e2ed7c3b1a1148b29ce456dda8e84ef137605
 AUX postupgrade-en.txt 665 SHA256 aec1179a04056a650a4f7429a927f510cd0e7256f889fdae2575ef471634ba41 WHIRLPOOL 512578b971cee45e0699e7461dd12ee37844bda48e69018d8956f81768e13a31ff30f91421697228410e61fa7159dc1a07e0831d8f4941e6d1bf1855d8d08207
 AUX tracd.confd 359 SHA256 6ae50c887d18f8eeda7d59c4d3fd1b5e07e407711c4e4679fef3583f7be8ed6e WHIRLPOOL 591394e732d39bc13f97004cfb3c18128aa16a55557172d872797b5ca5c69e5f15d1420e697a4e40215b2a893ed684ba6b6388abacd97874fd6f04953b579e1a
 AUX tracd.initd 919 SHA256 21a2f301ec584917628a62a0809b9603a5f0b460f902b23b3867174a710bb132 WHIRLPOOL 06fc2a8833786d86821180d010de4b69fbc9eeee0c7bafd4c7ab77599740f84caec1b6bbde79ab6349100da21e246a0cf05dd1a767fafae75d02f2c8c058ebb9
-DIST Trac-1.0.3.tar.gz 3579519 SHA256 19ac16024c6bfe6eb98ae2a54b7262885cd1246dfc70cc479b9ee07bbf5ec573 WHIRLPOOL 2c66a56daa5a384f900585a4844f5e4da09cdc0e5cd282a785f094fdc2c5e8ec54d276f41de1be9b381554dca2fad33455fa14860287a62ca9e13421dbe21a0b
-EBUILD trac-1.0.3.ebuild 2863 SHA256 495009f03b00577ed712902b82ef3c39619e8d5c39554d91333a2e66765f8971 WHIRLPOOL a7b967954bd52164bd11c1cedfd7ec13897f11bf50a5c8a33acda2380b2eeead4186b988b48ff5490d1906a3f091931465c0d903ebbbe6ce01744d577c134e8d
-MISC ChangeLog 6123 SHA256 e9831aa4eb820415de7a256d722a9e457c30df90490f50849921e01df3173b5a WHIRLPOOL a230b64924b41dc7e9fb41843302fa3d70c64e9cb542bbd0445dac50fbdc7d2ab0ca2f0dcb7368164baf169f951315256705a50cbf09c07e9987a2ab07fca2fe
-MISC metadata.xml 499 SHA256 7a5b18660b460642c4999f70decc78d428c283c218e7b1f41900969d5892fbf6 WHIRLPOOL a0089165226a9d00929b73926446269f3be34e0e92c8a3e7f42f16b2fe16ea4dd806ce5072f576eeddc7d9f47d1ad86cd9fb99d1604b394415cf0346ac9f43c2
+DIST Trac-1.0.4.tar.gz 3579886 SHA256 a1d564c5b612306856dd26851270b12fbba91bab1bc146b66d4cc248be1a172e WHIRLPOOL 2be04e6a683f88923b2f9b09fdee4b5de24779f399f32763674512f71f4f03e72b74592e0dc49e6693dc1c6c1c4ebdfb680eac72146b9fdb3735db50a5e8c9fb
+EBUILD trac-1.0.4.ebuild 2838 SHA256 5af3dbc6e53cbd7e118b71c9c92018a4a5eeede294ee9475cfefa3cd87b59b20 WHIRLPOOL d41b5d6a5bd333b78f9902e28291689b2955e033598d82f6b27f9830e8ddef5a5f1ac2e6267de40bc1d8c8ca7d63d0894c140ae0841dfe28bcc62fb475a1b524
+MISC ChangeLog 6312 SHA256 72746ad00e6d43b80409d3d5aa506f4af9ba984b6bd1c15ab6c89a4199e769d8 WHIRLPOOL 7571fb1713ad85d96e92e9cb62f9928e0fed846509c3671afaf99c4c07488b53ea7688b6fcd3242240d21225c8100c273385b909f10c51542ac65624fd1aa7c8
+MISC metadata.xml 541 SHA256 7e8abe1f0ab7f7a4d425050c47e27175423e7de5707b61f2f08222b34a33f8cd WHIRLPOOL 06ab90f6a94a4a4f862cdd09bd20c45afe96396d42fb133d0b2a054564c2babc8cf45a61438f836105e066cf8e21a228a5031ebfd0b2902918a04efae419e694
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
index 434d8735..103f9155 100644
--- a/www-apps/trac/metadata.xml
+++ b/www-apps/trac/metadata.xml
@@ -8,7 +8,7 @@
     </maintainer>
     <use>
         <flag name="i18n">Enable support for i18n with dev-python/Babel</flag>
-        <flag name="highlight">Enable source code highlighting</flag>
-        <flag name="markdown">Markdown support</flag>
+        <flag name="highlight">Enable syntax highlighting</flag>
+        <flag name="restructuredtext">Enable support for reStructuredText for wiki formatting</flag>
     </use>
 </pkgmetadata>
diff --git a/www-apps/trac/trac-1.0.3.ebuild b/www-apps/trac/trac-1.0.4.ebuild
index 72bc18c5..dd831c65 100644
--- a/www-apps/trac/trac-1.0.3.ebuild
+++ b/www-apps/trac/trac-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-1.0.3.ebuild,v 1.1 2015/01/18 12:36:22 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-1.0.4.ebuild,v 1.1 2015/02/08 14:26:19 djc Exp $
 
 EAPI=5
 
@@ -19,26 +19,26 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cgi fastcgi i18n +highlight +markdown mysql postgres +sqlite subversion test"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]
-	>=dev-python/genshi-0.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
 	highlight? (
 		|| (
-			>=dev-python/pygments-0.6[${PYTHON_USEDEP}]
-			>=app-text/silvercity-0.9.4
-			>=app-text/pytextile-2.0
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
 			app-text/enscript
 		)
 	)
-	markdown? ( >=dev-python/docutils-0.3.9[${PYTHON_USEDEP}] )
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
 	cgi? ( virtual/httpd-cgi )
 	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
+	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[python,${PYTHON_USEDEP}] )
@@ -63,7 +63,7 @@ pkg_setup() {
 
 python_test() {
 	echo ".python = ${EPYTHON}" > Makefile.cfg
-	emake test
+	emake test || die
 }
 
 python_install() {