fix templates and page order (backported from trunk)

(Portage version: 2.1.4.4)

7 files changed, 166 insertions, 12 deletions

diff --git a/www-apps/trac-webadmin/ChangeLog b/www-apps/trac-webadmin/ChangeLog
index 9a91e08ad0ae..878a6710b95b 100644
--- a/www-apps/trac-webadmin/ChangeLog
+++ b/www-apps/trac-webadmin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/trac-webadmin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/ChangeLog,v 1.6 2007/02/13 20:39:33 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/ChangeLog,v 1.7 2008/03/04 10:25:07 hollow Exp $
+
+*trac-webadmin-0.1.2-r1 (04 Mar 2008)
+
+  04 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/trac-webadmin-0.1.2-page_order.patch,
+  +files/trac-webadmin-0.1.2-template.patch, metadata.xml,
+  trac-webadmin-0.1.1.ebuild, trac-webadmin-0.1.2.ebuild,
+  +trac-webadmin-0.1.2-r1.ebuild:
+  fix templates and page order (backported from trunk)
 
   13 Feb 2007; Markus Rothe <corsair@gentoo.org> trac-webadmin-0.1.2.ebuild:
   Added ~ppc64; bug #166675
diff --git a/www-apps/trac-webadmin/files/trac-webadmin-0.1.2-page_order.patch b/www-apps/trac-webadmin/files/trac-webadmin-0.1.2-page_order.patch
new file mode 100644
index 000000000000..79961c1b8bb4
--- /dev/null
+++ b/www-apps/trac-webadmin/files/trac-webadmin-0.1.2-page_order.patch
@@ -0,0 +1,22 @@
+diff -NurpP trac-webadmin-0.1.2/webadmin/web_ui.py webadmin/webadmin/web_ui.py
+--- trac-webadmin-0.1.2/webadmin/web_ui.py	2006-11-13 23:48:07.000000000 +0100
++++ webadmin/webadmin/web_ui.py	2008-03-04 11:08:15.533564477 +0100
+@@ -87,7 +87,17 @@ class AdminModule(Component):
+             for page in p:
+                 providers[(page[0], page[2])] = provider
+             pages += p
+-        pages.sort()
++        def _page_order(p1, p2):
++            if p1[0] == 'general':
++                if p2[0] == 'general':
++                    return cmp(p1[1:], p2[1:])
++                return -1
++            elif p2[0] == 'general':
++                if p1[0] == 'general':
++                    return cmp(p1[1:], p2[1:])
++                return 1
++            return cmp(p1, p2)
++        pages.sort(_page_order)
+         return pages, providers
+ 
+     def process_request(self, req):
diff --git a/www-apps/trac-webadmin/files/trac-webadmin-0.1.2-template.patch b/www-apps/trac-webadmin/files/trac-webadmin-0.1.2-template.patch
new file mode 100644
index 000000000000..35cd43b53fb5
--- /dev/null
+++ b/www-apps/trac-webadmin/files/trac-webadmin-0.1.2-template.patch
@@ -0,0 +1,81 @@
+diff -NurpP trac-webadmin-0.1.2/webadmin/templates/admin_basics.cs webadmin/webadmin/templates/admin_basics.cs
+--- trac-webadmin-0.1.2/webadmin/templates/admin_basics.cs	2006-11-13 23:48:04.000000000 +0100
++++ webadmin/webadmin/templates/admin_basics.cs	2008-03-04 11:08:15.525564021 +0100
+@@ -10,7 +10,7 @@
+   </div>
+   <div class="field">
+    <label>URL:<br />
+-    <input type="text" name="url" size="48 "value="<?cs
++    <input type="text" name="url" size="48" value="<?cs
+       var:admin.project.url ?>" />
+    </label>
+   </div>
+diff -NurpP trac-webadmin-0.1.2/webadmin/templates/admin_enum.cs webadmin/webadmin/templates/admin_enum.cs
+--- trac-webadmin-0.1.2/webadmin/templates/admin_enum.cs	2006-11-13 23:48:05.000000000 +0100
++++ webadmin/webadmin/templates/admin_enum.cs	2008-03-04 11:08:15.525564021 +0100
+@@ -5,7 +5,7 @@ if:admin.enum.name ?>
+   <fieldset>
+    <legend>Modify <?cs var:admin.enum.label_singular ?></legend>
+    <div class="field">
+-    <label>Name: <input type="text" name="name"value="<?cs
++    <label>Name: <input type="text" name="name" value="<?cs
+       var:admin.enum.name ?>" /></label>
+    </div>
+    <div class="buttons">
+diff -NurpP trac-webadmin-0.1.2/webadmin/templates/admin_log.cs webadmin/webadmin/templates/admin_log.cs
+--- trac-webadmin-0.1.2/webadmin/templates/admin_log.cs	2006-11-13 23:48:06.000000000 +0100
++++ webadmin/webadmin/templates/admin_log.cs	2008-03-04 11:08:15.529564249 +0100
+@@ -30,7 +30,7 @@
+   var:admin.log.dir ?></code>).</p>
+  </div>
+  <script type="text/javascript">
+-   var logType = document.getElementById("log_type");
++   var log_type = document.getElementById("log_type");
+    var enableLevelAndFile = function() {
+      enableControl("log_level", log_type.selectedIndex > 0);
+      enableControl("log_file",
+diff -NurpP trac-webadmin-0.1.2/webadmin/templates/admin_milestone.cs webadmin/webadmin/templates/admin_milestone.cs
+--- trac-webadmin-0.1.2/webadmin/templates/admin_milestone.cs	2006-11-13 23:48:05.000000000 +0100
++++ webadmin/webadmin/templates/admin_milestone.cs	2008-03-04 11:08:15.529564249 +0100
+@@ -5,7 +5,7 @@ if:admin.milestone.name ?>
+   <fieldset>
+    <legend>Modify Milestone:</legend>
+    <div class="field">
+-    <label>Name:<br /> <input type="text" name="name"value="<?cs
++    <label>Name:<br /> <input type="text" name="name" value="<?cs
+       var:admin.milestone.name ?>" /></label>
+    </div>
+    <div class="field">
+diff -NurpP trac-webadmin-0.1.2/webadmin/templates/admin_plugin.cs webadmin/webadmin/templates/admin_plugin.cs
+--- trac-webadmin-0.1.2/webadmin/templates/admin_plugin.cs	2006-11-13 23:48:05.000000000 +0100
++++ webadmin/webadmin/templates/admin_plugin.cs	2008-03-04 11:08:15.525564021 +0100
+@@ -4,7 +4,7 @@
+  <fieldset>
+   <legend>Install Plugin:</legend>
+   <div class="field">
+-   <label>File: <input type="file" name="egg_file"<?cs
++   <label>File: <input type="file" name="plugin_file"<?cs
+      if:admin.readonly ?> disabled="disabled"<?cs /if ?> /></label>
+   </div>
+   <p class="help"><?cs
+@@ -63,7 +63,7 @@
+     if:!component.required ?><input type="hidden" name="component" value="<?cs
+      var:component.module ?>.<?cs var:component.name ?>" /><?cs
+     /if ?><input type="checkbox" name="enable" value="<?cs
+-     var:component.module ?>.<?cs var:component.name ?>"<?cs 
++     var:component.module ?>.<?cs var:component.name ?>"<?cs
+      if:component.enabled ?> checked="checked"<?cs
+      /if ?><?cs
+      if:component.required ?> disabled="disabled"<?cs
+diff -NurpP trac-webadmin-0.1.2/webadmin/templates/admin_version.cs webadmin/webadmin/templates/admin_version.cs
+--- trac-webadmin-0.1.2/webadmin/templates/admin_version.cs	2006-11-13 23:48:05.000000000 +0100
++++ webadmin/webadmin/templates/admin_version.cs	2008-03-04 11:08:15.525564021 +0100
+@@ -5,7 +5,7 @@ if:admin.version.name ?>
+   <fieldset>
+    <legend>Modify Version:</legend>
+    <div class="field">
+-    <label>Name:<br /> <input type="text" name="name"value="<?cs
++    <label>Name:<br /> <input type="text" name="name" value="<?cs
+       var:admin.version.name ?>" /></label>
+    </div>
+    <div class="field">
diff --git a/www-apps/trac-webadmin/metadata.xml b/www-apps/trac-webadmin/metadata.xml
index f1850ed53c18..1f7848ba097d 100644
--- a/www-apps/trac-webadmin/metadata.xml
+++ b/www-apps/trac-webadmin/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-  <email>dju@gentoo.org</email>
-</maintainer>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>dju@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/trac-webadmin/trac-webadmin-0.1.1.ebuild b/www-apps/trac-webadmin/trac-webadmin-0.1.1.ebuild
index 300f4e6057a2..edd7c4a50f5d 100644
--- a/www-apps/trac-webadmin/trac-webadmin-0.1.1.ebuild
+++ b/www-apps/trac-webadmin/trac-webadmin-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.1.ebuild,v 1.3 2007/01/07 19:44:38 dju Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.1.ebuild,v 1.4 2008/03/04 10:25:07 hollow Exp $
 
 inherit distutils
 
@@ -19,7 +19,7 @@ DEPEND=">=www-apps/trac-0.9.3
 
 # from marienz's setuptools.eclass:
 src_install() {
-	${python} setup.py install --root=${D} --no-compile \
+	"${python}" setup.py install --root="${D}" --no-compile \
 		--single-version-externally-managed "$@" || die
 
 	DDOCS="CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO"
diff --git a/www-apps/trac-webadmin/trac-webadmin-0.1.2-r1.ebuild b/www-apps/trac-webadmin/trac-webadmin-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..75ea45c76cdc
--- /dev/null
+++ b/www-apps/trac-webadmin/trac-webadmin-0.1.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2-r1.ebuild,v 1.1 2008/03/04 10:25:07 hollow Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="A Trac plugin for administering Trac projects through the web interface."
+HOMEPAGE="http://projects.edgewall.com/trac/wiki/WebAdmin"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND="=www-apps/trac-0.10*
+	>=dev-python/setuptools-0.6_rc1"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${P}-template.patch
+	epatch "${FILESDIR}"/${P}-page_order.patch
+}
+
+src_install() {
+	distutils_src_install --single-version-externally-managed
+}
+
+src_test() {
+	"${python}" setup.py test || die "tests failed"
+}
+
+pkg_postinst() {
+	elog "To enable the WebAdmin plugin in your Trac environments, you have to add:"
+	elog "    [components]"
+	elog "    webadmin.* = enabled"
+	elog "to your trac.ini files."
+	elog
+	elog "To be able to see the Admin tab, your users must have the TRAC_ADMIN permission"
+	elog "and/or the TICKET_ADMIN permission."
+}
diff --git a/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild b/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild
index fc2f6b92448d..a7aeb52f9efa 100644
--- a/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild
+++ b/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.5 2008/03/04 10:25:07 hollow Exp $
 
 inherit distutils
 
@@ -19,7 +19,7 @@ DEPEND=">=www-apps/trac-0.10
 
 # from marienz's setuptools.eclass:
 src_install() {
-	"${python}" setup.py install --root=${D} --no-compile \
+	"${python}" setup.py install --root="${D}" --no-compile \
 		--single-version-externally-managed "$@" || die "install failed"
 }