Version bump wrt bug #118621, cleaned out old versions.

Package-Manager: portage-2.0.53

11 files changed, 40 insertions, 253 deletions

diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild
deleted file mode 100644
index 929ec63f6c7f..000000000000
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.8-r1.ebuild,v 1.7 2005/10/23 14:59:08 rl03 Exp $
-
-inherit perl-module webapp
-
-DESCRIPTION="Apache gallery for mod_perl"
-SRC_URI="http://cpan.org/modules/by-module/Apache/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/author/LEGART/${P}"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
-IUSE="apache2"
-
-DEPEND="${DEPEND}
-	>=www-apache/libapreq-1.0
-	>=media-libs/imlib2-1.0.6-r1
-	>=www-apache/mod_perl-1.27-r1
-	>=dev-perl/ImageInfo-1.04-r2
-	>=dev-perl/ImageSize-2.99-r1
-	dev-perl/Image-Imlib2
-	>=perl-core/CGI-2.93
-	>=dev-perl/CGI-FastTemplate-1.09
-	>=dev-perl/Parse-RecDescent-1.80-r3
-	dev-perl/URI
-	dev-perl/text-template
-	>=dev-perl/Inline-0.43-r1
-	virtual/x11
-	!apache2? ( >=net-www/apache-1.3.26-r2 )
-	apache2? ( >=net-www/apache-2.0.43-r1 ) "
-
-src_install() {
-	webapp_src_preinst
-	mydoc="INSTALL"
-
-	perl-module_src_install
-
-	insinto ${MY_ICONSDIR}/gallery
-	doins htdocs/*.png
-
-	dodir ${MY_HOSTROOTDIR}/${PN}/templates/default
-	dodir ${MY_HOSTROOTDIR}/${PN}/templates/new
-
-	insinto ${MY_HOSTROOTDIR}/${PN}/templates/default
-	doins templates/default/*
-	insinto ${MY_HOSTROOTDIR}/${PN}/templates/new
-	doins templates/new/*
-
-	if use apache2; then
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/76_apache-gallery.conf
-	else
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/apache-gallery.conf
-	fi
-	webapp_src_install
-}
-
-pkg_postinst() {
-	if use apache2; then
-		einfo
-		einfo "You should edit your /etc/apache2/conf/modules.d/76_apache-gallery.conf file to suit."
-	else
-		einfo
-		einfo "Execute \"emerge --config =${PF}\""
-		einfo "to have your apache.conf auto-updated."
-		einfo "You should then edit your /etc/apache/conf/addon-modules/apache-gallery.conf file to suit."
-		einfo
-	fi
-	webapp_pkg_postinst
-}
-
-pkg_config() {
-	use apache2 || \
-		echo "Include  /etc/apache/conf/addon-modules/apache-gallery.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild
deleted file mode 100644
index 3b362e65f751..000000000000
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.8-r2.ebuild,v 1.5 2005/10/23 14:59:08 rl03 Exp $
-
-inherit perl-module webapp
-
-DESCRIPTION="Apache gallery for mod_perl"
-SRC_URI="http://cpan.org/modules/by-module/Apache/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/author/LEGART/${P}"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
-IUSE="apache2"
-
-DEPEND="${DEPEND}
-	>=www-apache/libapreq-1.0
-	>=media-libs/imlib2-1.0.6-r1
-	>=www-apache/mod_perl-1.27-r1
-	>=dev-perl/ImageInfo-1.04-r2
-	>=dev-perl/ImageSize-2.99-r1
-	dev-perl/Image-Imlib2
-	>=perl-core/CGI-2.93
-	>=dev-perl/CGI-FastTemplate-1.09
-	>=dev-perl/Parse-RecDescent-1.80-r3
-	dev-perl/URI
-	dev-perl/text-template
-	>=dev-perl/Inline-0.43-r1
-	virtual/x11
-	!apache2? ( >=net-www/apache-1.3.26-r2 )
-	apache2? ( >=net-www/apache-2.0.43-r1 ) "
-
-src_install() {
-	webapp_src_preinst
-	mydoc="INSTALL"
-
-	perl-module_src_install
-
-	insinto ${MY_ICONSDIR}/gallery
-	doins htdocs/*.png
-
-	dodir ${MY_HOSTROOTDIR}/${PN}/templates/default
-	dodir ${MY_HOSTROOTDIR}/${PN}/templates/new
-
-	insinto ${MY_HOSTROOTDIR}/${PN}/templates/default
-	doins templates/default/*
-	insinto ${MY_HOSTROOTDIR}/${PN}/templates/new
-	doins templates/new/*
-
-	if use apache2; then
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/76_apache-gallery.conf
-	else
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/apache-gallery.conf
-	fi
-	webapp_src_install
-}
-
-pkg_postinst() {
-	if use apache2; then
-		einfo
-		einfo "You should edit your /etc/apache2/conf/modules.d/76_apache-gallery.conf file to suit."
-	else
-		einfo
-		einfo "Execute \"emerge --config =${PF}\""
-		einfo "to have your apache.conf auto-updated."
-		einfo "You should then edit your /etc/apache/conf/addon-modules/apache-gallery.conf file to suit."
-		einfo
-	fi
-	webapp_pkg_postinst
-}
-
-pkg_config() {
-	use apache2 || \
-		echo "Include  /etc/apache/conf/addon-modules/apache-gallery.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild
deleted file mode 100644
index 548be1097770..000000000000
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.8.ebuild,v 1.8 2005/10/23 14:59:08 rl03 Exp $
-
-inherit perl-module
-
-DESCRIPTION="Apache gallery for mod_perl"
-SRC_URI="http://cpan.org/modules/by-module/Apache/${P}.tar.gz"
-HOMEPAGE="http://search.cpan.org/author/LEGART/${P}"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
-IUSE=""
-
-
-DEPEND="${DEPEND}
-	>=www-apache/libapreq-1.0
-	>=media-libs/imlib2-1.0.6-r1
-	>=www-apache/mod_perl-1.27-r1
-	>=dev-perl/ImageInfo-1.04-r2
-	>=dev-perl/ImageSize-2.99-r1
-	dev-perl/Image-Imlib2
-	>=perl-core/CGI-2.78-r3
-	>=dev-perl/CGI-FastTemplate-1.09
-	>=dev-perl/Parse-RecDescent-1.80-r3
-	dev-perl/URI
-	dev-perl/text-template
-	>=dev-perl/Inline-0.43-r1
-	virtual/x11"
-
-
-
-src_install() {
-	mydoc="INSTALL"
-
-	perl-module_src_install
-
-	insinto /home/httpd/icons
-	doins htdocs/*.png
-
-	insinto /etc/apache/gallery/templates
-	doins templates/*.tpl
-
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/apache-gallery.conf
-}
-
-pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
-
-	einfo
-	einfo "Execute \"emerge --config =${PF}\""
-	einfo "to have your apache.conf auto-updated."
-	einfo "You should then edit your /etc/apache/conf/apache-gallery.conf file to suit."
-	einfo
-}
-
-pkg_config() {
-	echo "Include  conf/apache-gallery.conf" \
-	>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
index 726c8bb1854f..8f5e8b03e5bb 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
@@ -1,37 +1,42 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-0.9.1.ebuild,v 1.4 2005/09/24 18:53:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.1 2006/01/11 14:59:37 rl03 Exp $
 
 inherit depend.apache perl-module webapp
 
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+MY_P=${P/_rc/RC}
 DESCRIPTION="Apache gallery for mod_perl"
-SRC_URI="http://apachegallery.dk/download/${P}.tar.gz"
+SRC_URI="http://apachegallery.dk/download/${MY_P}.tar.gz"
 HOMEPAGE="http://apachegallery.dk/"
 
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="apache2"
 
+S=${WORKDIR}/${MY_P}
+
 DEPEND="${DEPEND}
 	=dev-lang/perl-5*
+	!apache2? ( >=net-www/apache-1.3.26-r2
+		=www-apache/libapreq-1* )
+	apache2? ( >=net-www/apache-2.0.43-r1
+		=www-apache/libapreq2-2* )
+	virtual/x11
 	>=media-libs/imlib2-1.0.6-r1
+	dev-perl/URI
 	>=dev-perl/ImageInfo-1.04-r2
 	>=dev-perl/ImageSize-2.99-r1
-	dev-perl/Image-Imlib2
-	>=perl-core/CGI-2.93
-	>=dev-perl/CGI-FastTemplate-1.09
-	>=dev-perl/Parse-RecDescent-1.80-r3
-	dev-perl/URI
 	dev-perl/text-template
-	>=dev-perl/Inline-0.43-r1
-	virtual/x11
-	!apache2? ( >=net-www/apache-1.3.26-r2
-		=www-apache/libapreq-1* )
-	apache2? ( >=net-www/apache-2.0.43-r1
-		=www-apache/libapreq2-2* )"
+	>=perl-core/CGI-3.08
+	dev-perl/Image-Imlib2
+"
 
 src_install() {
 	webapp_src_preinst
+	dodoc Changes INSTALL README TODO UPGRADE
+
 	mydoc="INSTALL"
 
 	perl-module_src_install
diff --git a/www-apps/Apache-Gallery/ChangeLog b/www-apps/Apache-Gallery/ChangeLog
index d755193476df..b8986d2f880f 100644
--- a/www-apps/Apache-Gallery/ChangeLog
+++ b/www-apps/Apache-Gallery/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/Apache-Gallery
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.16 2005/10/23 14:59:08 rl03 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.17 2006/01/11 14:59:37 rl03 Exp $
+
+*Apache-Gallery-1.0_rc3 (11 Jan 2006)
+
+  11 Jan 2006; Renat Lumpau <rl03@gentoo.org> -Apache-Gallery-0.8.ebuild,
+  -Apache-Gallery-0.8-r1.ebuild, -Apache-Gallery-0.8-r2.ebuild,
+  -Apache-Gallery-0.9.1.ebuild, +Apache-Gallery-1.0_rc3.ebuild:
+  Version bump wrt bug #118621, cleaned out old versions.
 
   23 Oct 2005; Renat Lumpau <rl03@gentoo.org> Apache-Gallery-0.6.ebuild,
   Apache-Gallery-0.8.ebuild, Apache-Gallery-0.8-r1.ebuild,
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
index 6afe68a9e772..ad6fa3540412 100644
--- a/www-apps/Apache-Gallery/Manifest
+++ b/www-apps/Apache-Gallery/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aefd824be16643a56f802d7d6ef4d209 Apache-Gallery-0.8-r2.ebuild 2086
 MD5 81ea0232b55758d1c56a1ff0342b4695 Apache-Gallery-0.6.ebuild 1421
-MD5 ed5914f590c899b06f60b1925b42ebfc Apache-Gallery-0.8.ebuild 1486
-MD5 32430db3c6811677f44ca51b4bd0a6d6 Apache-Gallery-0.8-r1.ebuild 2086
-MD5 d810d3fda63ae815ed953913e95c14f7 Apache-Gallery-0.9.1.ebuild 1594
-MD5 de22fd772d54b278fd2c9c02279c7162 ChangeLog 3746
-MD5 2a5bdc93be7720976d88be5034a17df2 metadata.xml 444
-MD5 3c77fe3e38d06f53fca962becfe10d81 files/digest-Apache-Gallery-0.8-r1 69
-MD5 3c77fe3e38d06f53fca962becfe10d81 files/digest-Apache-Gallery-0.8-r2 69
-MD5 f372bf3342f63c4d3a680051e80b5571 files/digest-Apache-Gallery-0.6 69
-MD5 3c77fe3e38d06f53fca962becfe10d81 files/digest-Apache-Gallery-0.8 69
+MD5 c1ec0f3028bcc0a80a176d6552f562d5 Apache-Gallery-1.0_rc3.ebuild 1617
+MD5 ef37431f24c04226223c34d833ce6e09 ChangeLog 4046
+MD5 862b7db14e194f66c345bdaee71e0d00 files/76_apache-gallery.conf 1461
+MD5 9e0a44b67c66dc689a3769827946f3f8 files/76_apache1-gallery.conf 738
 MD5 004b7af7fb9d52598cf9ed7db91697c6 files/76_apache2-gallery.conf 1442
 MD5 d9a1361f6d0f1dac9def27a0b57cf30c files/apache-gallery.conf 757
+MD5 f372bf3342f63c4d3a680051e80b5571 files/digest-Apache-Gallery-0.6 69
+MD5 af084bb70094ac69911af16d31ebf83f files/digest-Apache-Gallery-1.0_rc3 72
 MD5 5edd6a9688af26ad0b3f71d8e2ad8770 files/postinstall-en.txt 90
-MD5 9e0a44b67c66dc689a3769827946f3f8 files/76_apache1-gallery.conf 738
-MD5 f946c05f08e4b517465f3a09639a5fe7 files/digest-Apache-Gallery-0.9.1 71
-MD5 862b7db14e194f66c345bdaee71e0d00 files/76_apache-gallery.conf 1461
+MD5 2a5bdc93be7720976d88be5034a17df2 metadata.xml 444
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDW6VVEzitwsaoONoRAusgAKCG/LrSpU2h1es/KddF9RfQd6t7BACfbh/8
-NjkJOlIUA4YRqljl6dPlWCw=
-=jT2S
+iD8DBQFDxR1kEzitwsaoONoRAgiEAJ4lOvgIy9A8VlAAyH7jR7FuhFF/cQCcCn9m
+l0wxr7OyLubG61Vn1SLSg7E=
+=GxVw
 -----END PGP SIGNATURE-----
diff --git a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8 b/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8
deleted file mode 100644
index 751d21f9d580..000000000000
--- a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c04d7d8edc90982eae68a431077f9413 Apache-Gallery-0.8.tar.gz 77184
diff --git a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8-r1 b/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8-r1
deleted file mode 100644
index 751d21f9d580..000000000000
--- a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c04d7d8edc90982eae68a431077f9413 Apache-Gallery-0.8.tar.gz 77184
diff --git a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8-r2 b/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8-r2
deleted file mode 100644
index 751d21f9d580..000000000000
--- a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c04d7d8edc90982eae68a431077f9413 Apache-Gallery-0.8.tar.gz 77184
diff --git a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.9.1 b/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.9.1
deleted file mode 100644
index b3649f88c1f4..000000000000
--- a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 882e650e6fc3f059e84eca1564b5f32f Apache-Gallery-0.9.1.tar.gz 82230
diff --git a/www-apps/Apache-Gallery/files/digest-Apache-Gallery-1.0_rc3 b/www-apps/Apache-Gallery/files/digest-Apache-Gallery-1.0_rc3
new file mode 100644
index 000000000000..29515efb8771
--- /dev/null
+++ b/www-apps/Apache-Gallery/files/digest-Apache-Gallery-1.0_rc3
@@ -0,0 +1 @@
+MD5 a705cbecf2f124d18a3bde3fc36384e8 Apache-Gallery-1.0RC3.tar.gz 83891