pyblosxom-1.3 seems to work fine.

svn path=/stable/; revision=647

5 files changed, 36 insertions, 2 deletions

diff --git a/www-apps/pyblosxom/Manifest b/www-apps/pyblosxom/Manifest
index 52f9a03..8b57591 100644
--- a/www-apps/pyblosxom/Manifest
+++ b/www-apps/pyblosxom/Manifest
@@ -1,7 +1,10 @@
 MD5 e4ddf2c046982bbd6d01bf1009b2ec2c ChangeLog 525
 MD5 0835a464fdaa7a605c63376bb18a2b24 files/config-hook.sh 468
 MD5 072ef383d4b7bba7b7f5d2207c00267c files/digest-pyblosxom-1.2.1 66
+MD5 7fa7abb040391e67040e37bb5174f0c4 files/digest-pyblosxom-1.3 64
 MD5 549472aeb8561d15d9795008c05e2b81 files/gentoo-webapp.patch 1096
 MD5 1b151b39edadce257e08dac6407dd8fd files/postinstall-en.txt 326
+MD5 390362a037381b6308821899d4960e31 files/postupgrade-en.txt 369
+MD5 cabe34d17af3f4b5f5c29fec650599cf files/pyblosxom-1.3-gentoo.patch 874
 MD5 2475b9abb75a74d9fa92ea07cfaf7d41 metadata.xml 300
-MD5 4dfb3fab8b4317c8f67a2f0cf9c54880 pyblosxom-1.2.1.ebuild 1016
+MD5 9b0da1234fc6d375065fd4022d981e31 pyblosxom-1.3.ebuild 1072
diff --git a/www-apps/pyblosxom/files/digest-pyblosxom-1.3 b/www-apps/pyblosxom/files/digest-pyblosxom-1.3
new file mode 100644
index 0000000..43d4ee6
--- /dev/null
+++ b/www-apps/pyblosxom/files/digest-pyblosxom-1.3
@@ -0,0 +1 @@
+MD5 b3af067abc75b50bdb11fff3b71acc07 pyblosxom-1.3.tar.gz 90888
diff --git a/www-apps/pyblosxom/files/postupgrade-en.txt b/www-apps/pyblosxom/files/postupgrade-en.txt
new file mode 100644
index 0000000..45e2b14
--- /dev/null
+++ b/www-apps/pyblosxom/files/postupgrade-en.txt
@@ -0,0 +1,10 @@
+pyblosxom-1.3 changes nearly nothing in the config file.
+
+The only new variable you need to set is 'blog_rights'. It should
+contain your name and will be added to the atom feed.
+
+Anyway you only need to run etc-update on you ocnfig file as 
+suggested by webapp-config. Update the configuration following
+standard procedures and you should be all set.
+
+Enjoy pyblosxom!
diff --git a/www-apps/pyblosxom/files/pyblosxom-1.3-gentoo.patch b/www-apps/pyblosxom/files/pyblosxom-1.3-gentoo.patch
new file mode 100644
index 0000000..2fa248e
--- /dev/null
+++ b/www-apps/pyblosxom/files/pyblosxom-1.3-gentoo.patch
@@ -0,0 +1,19 @@
+--- ../pyblosxom-1.3.orig/setup.py	2006-02-02 20:49:21.000000000 +0100
++++ setup.py	2006-02-02 20:52:50.000000000 +0100
+@@ -72,11 +72,12 @@
+ 
+     # we want to move the web script files as well, so we sneak them
+     # in here.
++# These are handled by the webapp class in Gentoo
++#                  os.path.normpath("web/pyblosxom.cgi"), 
++#                   os.path.normpath("web/config.py")
+     pydf.append( [os.path.join('share', PVER, 'web'),
+-                  [os.path.normpath("web/pyblosxom.cgi"), 
+-                   os.path.normpath("web/pyblosxom.tac"), 
+-                   os.path.normpath("web/wsgi_app.py"), 
+-                   os.path.normpath("web/config.py")]])
++                  [os.path.normpath("web/pyblosxom.tac"), 
++                   os.path.normpath("web/wsgi_app.py")]])
+ 
+ else:
+     # we don't know what platform they have, so we print out
diff --git a/www-apps/pyblosxom/pyblosxom-1.2.1.ebuild b/www-apps/pyblosxom/pyblosxom-1.3.ebuild
index 21fc252..d5a28a4 100644
--- a/www-apps/pyblosxom/pyblosxom-1.2.1.ebuild
+++ b/www-apps/pyblosxom/pyblosxom-1.3.ebuild
@@ -19,7 +19,7 @@ src_unpack() {
 
 	unpack ${A} && cd "${S}"
 
-	epatch ${FILESDIR}/gentoo-webapp.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 
 }
 
@@ -39,6 +39,7 @@ src_install() {
 	webapp_configfile  ${MY_CGIBINDIR}/pyblosxom/config.py
 
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt
 	webapp_hook_script ${FILESDIR}/config-hook.sh
 
 	webapp_src_install