10 files changed, 77 insertions, 139 deletions
diff --git a/www-apps/pyblosxom/ChangeLog b/www-apps/pyblosxom/ChangeLog
index a2cf5789f3d9..f878d7fdc8a0 100644
--- a/www-apps/pyblosxom/ChangeLog
+++ b/www-apps/pyblosxom/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/pyblosxom
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/pyblosxom/ChangeLog,v 1.8 2007/05/16 07:30:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/pyblosxom/ChangeLog,v 1.9 2007/12/18 10:27:55 wrobel Exp $
+
+*pyblosxom-1.4.2 (18 Dec 2007)
+
+  18 Dec 2007; Gunnar Wrobel <wrobel@gentoo.org>
+  -files/pyblosxom-1.3.2-gentoo.patch, +files/pyblosxom-1.4.2-gentoo.patch,
+  -files/gentoo-webapp.patch, -pyblosxom-1.2.1.ebuild,
+  -pyblosxom-1.3.2.ebuild, +pyblosxom-1.4.2.ebuild:
+  Added pyblosxom 1.4.2 and removed all older versions. The older versions had
+  trouble with SLOTting since this package installs a python library and
+  cannot be slotted as the other web applications.
 
   16 May 2007; Christian Faulhammer <opfer@gentoo.org>
   pyblosxom-1.3.2.ebuild:
diff --git a/www-apps/pyblosxom/files/digest-pyblosxom-1.2.1 b/www-apps/pyblosxom/files/digest-pyblosxom-1.2.1
deleted file mode 100644
index dd5e0213f818..000000000000
--- a/www-apps/pyblosxom/files/digest-pyblosxom-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c59e2cb44a9e72ba5e46e265ed23f0ad pyblosxom-1.2.1.tar.gz 46580
-RMD160 2f4df57f4594180e9d46475f1060bfa34e2c0db8 pyblosxom-1.2.1.tar.gz 46580
-SHA256 7a8cd85945286df0c80bdf95dc2b8ed7e74ff50b02b08ffdd511546bb9b3e8a6 pyblosxom-1.2.1.tar.gz 46580
diff --git a/www-apps/pyblosxom/files/digest-pyblosxom-1.3.2 b/www-apps/pyblosxom/files/digest-pyblosxom-1.3.2
deleted file mode 100644
index 538f103c6ebf..000000000000
--- a/www-apps/pyblosxom/files/digest-pyblosxom-1.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b5304e6d70f043b2bf8366a09b28863d pyblosxom-1.3.2.tar.gz 94701
-RMD160 d85f1be077ae03c3bffc4c80d0eb1ae349305559 pyblosxom-1.3.2.tar.gz 94701
-SHA256 338cb25d8312dbaf0553385d21bb0f8fc22c180d1ae4e42b556a376eb7dec417 pyblosxom-1.3.2.tar.gz 94701
diff --git a/www-apps/pyblosxom/files/digest-pyblosxom-1.4.2 b/www-apps/pyblosxom/files/digest-pyblosxom-1.4.2
new file mode 100644
index 000000000000..e0bd0b382097
--- /dev/null
+++ b/www-apps/pyblosxom/files/digest-pyblosxom-1.4.2
@@ -0,0 +1,3 @@
+MD5 7e595aa92512002a8eac3bf8112a9c18 pyblosxom-1.4.2.tar.gz 107892
+RMD160 cdb6767c18dba0b802c0319770a68817a6e59d48 pyblosxom-1.4.2.tar.gz 107892
+SHA256 64bfbe91dbdfb1facac9eca85e682b1f603b9bde3894aeff689ce4f51c817843 pyblosxom-1.4.2.tar.gz 107892
diff --git a/www-apps/pyblosxom/files/gentoo-webapp.patch b/www-apps/pyblosxom/files/gentoo-webapp.patch
deleted file mode 100644
index 6630fb56848b..000000000000
--- a/www-apps/pyblosxom/files/gentoo-webapp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur pyblosxom-1.2.1.orig/setup.py pyblosxom-1.2.1/setup.py
---- pyblosxom-1.2.1.orig/setup.py	2005-07-31 13:06:25.000000000 +0200
-+++ pyblosxom-1.2.1/setup.py	2005-07-31 13:06:46.000000000 +0200
-@@ -64,12 +64,13 @@
- 
-     # 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/pyblosxom.tac"), 
-                    os.path.normpath("web/pyblosxom_wsgi.cgi"), 
--                   os.path.normpath("web/wsgi_app.py"), 
--                   os.path.normpath("web/config.py")]])
-+                   os.path.normpath("web/wsgi_app.py")]])
- 
- else:
-     # we don't know what platform they have, so we print out
-diff -Naur pyblosxom-1.2.1.orig/web/config.py pyblosxom-1.2.1/web/config.py
diff --git a/www-apps/pyblosxom/files/pyblosxom-1.3.2-gentoo.patch b/www-apps/pyblosxom/files/pyblosxom-1.3.2-gentoo.patch
deleted file mode 100644
index 2fa248ec9a83..000000000000
--- a/www-apps/pyblosxom/files/pyblosxom-1.3.2-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../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/files/pyblosxom-1.4.2-gentoo.patch b/www-apps/pyblosxom/files/pyblosxom-1.4.2-gentoo.patch
new file mode 100644
index 000000000000..cc7d59f8a021
--- /dev/null
+++ b/www-apps/pyblosxom/files/pyblosxom-1.4.2-gentoo.patch
@@ -0,0 +1,13 @@
+--- setup.py.orig	2007-12-18 11:13:36.439046250 +0100
++++ setup.py	2007-12-18 11:14:05.216844750 +0100
+@@ -73,9 +73,7 @@
+     # we want to move the web script files as well, so we sneak them
+     # in here.
+     pydf.append( [os.path.join('share', PVER, 'web'),
+-                  [os.path.normpath("web/pyblosxom.cgi"), 
+-                   os.path.normpath("web/pyblosxom.tac"), 
+-                   os.path.normpath("web/config.py")]])
++                  [os.path.normpath("web/pyblosxom.tac")]])
+ 
+ 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.2.1.ebuild
deleted file mode 100644
index 21fc252a70af..000000000000
--- a/www-apps/pyblosxom/pyblosxom-1.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/pyblosxom/pyblosxom-1.2.1.ebuild,v 1.1 2006/01/10 21:50:24 wrobel Exp $
-
-inherit eutils distutils webapp
-
-DESCRIPTION="PyBlosxom is a lightweight weblog system."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://pyblosxom.sourceforge.net/"
-
-LICENSE="MIT"
-KEYWORDS="~x86"
-
-IUSE=""
-
-DEPEND="virtual/python"
-
-src_unpack() {
-
-	unpack ${A} && cd "${S}"
-
-	epatch ${FILESDIR}/gentoo-webapp.patch
-
-}
-
-src_install() {
-	webapp_src_preinst
-
-	distutils_src_install
-	dodoc README
-
-	keepdir /usr/share/${P}/plugins
-	keepdir ${MY_HTDOCSDIR}/data
-	keepdir ${MY_HTDOCSDIR}/log
-
-	mkdir -p ${D}${MY_CGIBINDIR}/pyblosxom
-	cp web/{config.py,pyblosxom.cgi} ${D}${MY_CGIBINDIR}/pyblosxom/
-
-	webapp_configfile  ${MY_CGIBINDIR}/pyblosxom/config.py
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/config-hook.sh
-
-	webapp_src_install
-}
diff --git a/www-apps/pyblosxom/pyblosxom-1.3.2.ebuild b/www-apps/pyblosxom/pyblosxom-1.3.2.ebuild
deleted file mode 100644
index 2e960fdcd88b..000000000000
--- a/www-apps/pyblosxom/pyblosxom-1.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/pyblosxom/pyblosxom-1.3.2.ebuild,v 1.2 2007/05/16 07:30:08 opfer Exp $
-
-inherit eutils distutils webapp
-
-DESCRIPTION="PyBlosxom is a lightweight weblog system."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://pyblosxom.sourceforge.net/"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="virtual/python"
-
-src_unpack() {
-
-	unpack ${A} && cd "${S}"
-
-	epatch ${FILESDIR}/${P}-gentoo.patch || die "Patching failed!"
-
-}
-
-src_install() {
-	webapp_src_preinst
-
-	distutils_src_install
-	dodoc README
-
-	keepdir /usr/share/${P}/plugins
-	keepdir ${MY_HTDOCSDIR}/data
-	keepdir ${MY_HTDOCSDIR}/log
-
-	mkdir -p ${D}${MY_CGIBINDIR}/pyblosxom
-	cp web/{config.py,pyblosxom.cgi} ${D}${MY_CGIBINDIR}/pyblosxom/
-
-	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
-}
diff --git a/www-apps/pyblosxom/pyblosxom-1.4.2.ebuild b/www-apps/pyblosxom/pyblosxom-1.4.2.ebuild
new file mode 100644
index 000000000000..3addb21a47de
--- /dev/null
+++ b/www-apps/pyblosxom/pyblosxom-1.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/pyblosxom/pyblosxom-1.4.2.ebuild,v 1.1 2007/12/18 10:27:55 wrobel Exp $
+
+inherit eutils distutils webapp
+
+DESCRIPTION="PyBlosxom is a lightweight weblog system."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pyblosxom.sourceforge.net/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+# This installs python library files.
+SLOT=0
+WEBAPP_MANUAL_SLOT=yes
+
+IUSE=""
+
+DEPEND="virtual/python"
+
+src_unpack() {
+
+	unpack "${A}" && cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch || die "Patching failed!"
+
+}
+
+src_install() {
+	webapp_src_preinst
+
+	distutils_src_install
+	dodoc README
+
+	keepdir /usr/share/${P}/plugins
+	keepdir "${MY_HTDOCSDIR}"/data
+	keepdir "${MY_HTDOCSDIR}"/log
+
+	mkdir -p "${D}${MY_CGIBINDIR}"/pyblosxom
+	cp web/{config.py,pyblosxom.cgi} "${D}${MY_CGIBINDIR}"/pyblosxom/
+
+	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
+}