merge from webapp overlay + further cleanup and checks wrt #208584

Package-Manager: portage-2.1.4.4

7 files changed, 81 insertions, 113 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 4ae17438ffbf..6351b9e11dff 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.134 2008/02/05 15:13:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.135 2008/02/20 18:07:42 hollow Exp $
+
+  20 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
+  gallery-1.5.3.ebuild, -gallery-1.5.5.ebuild, gallery-1.5.7.ebuild,
+  gallery-2.2.4.ebuild:
+  merge from webapp overlay + further cleanup and checks wrt #208584
+
+  05 Feb 2008; Jakub Moc <jakub@gentoo.org> gallery-2.2.4.ebuild:
+  Remove bogus media-libs/gd dependency, simplify PHP check, clean-up.
 
   05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> gallery-1.5.3.ebuild,
   gallery-1.5.5.ebuild, gallery-1.5.7.ebuild:
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index c1577fcacdec..bc209d0c196e 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -4,19 +4,17 @@ Hash: SHA1
 AUX postinstall-en.txt 430 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 SHA1 c1abf75f41ca3dea22c029e3e3f6604c02e71d08 SHA256 e2e63ec31b83e97fec9ecc7163f84beda4744150fa179ce39f0c26ed7ec54f3b
 AUX postinstall-en2.txt 912 RMD160 c84759b0159710075f0099153bfc802cd76e8cb9 SHA1 afe393b216f0d5c9588e5e2d07cc852724860d2f SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b
 DIST gallery-1.5.3.tar.gz 2353018 RMD160 7f8e698bc3d145f1776dfa9dba3d213580f1061d SHA1 0e01ec98d1a45790c695ba96732145b99bc89926 SHA256 816d53da5f1fe4373b3e217143af86681c6d18e4b4dde0f1c6c8d8f5d2138481
-DIST gallery-1.5.5.tar.gz 2377249 RMD160 7886146913a6f9f81c28a4f42ca9071a40831464 SHA1 7e31a90a8204b83de2cf888e772d520741ea80c9 SHA256 56d9e9f2c29ccae57c044f38a165dd6c804a150ea9eb643f5a95336b00f825f7
 DIST gallery-1.5.7.tar.gz 2357005 RMD160 69b2488b228232173ad3b80072a3a90c952a08ca SHA1 70ce61509545bf76456e43a118e6c8c692e37841 SHA256 79fef2266c495cfaf7b50db27739fcea58270cebea1722a7ac0fa28ff9f8ea6c
 DIST gallery-2.2.4-full.tar.gz 11906720 RMD160 ba2cb946999660a55154e5f3dc9478e134589c59 SHA1 6b065dcb248e6d75d07099110cca21158abb1b8e SHA256 bc7eb368b26d31e65d9a11439483186a799bc9d21dfa33c48591e4cb0ca7f9a4
-EBUILD gallery-1.5.3.ebuild 1023 RMD160 491b34037ba06de098eca03fe59aad2ff9db2eb2 SHA1 97e7426b2d5d1f7baccf639adc8fa77196c88fbd SHA256 68e77d3704d229600fef5e3f82de908a913f0816f28358e15c0ecb6f8e1b197b
-EBUILD gallery-1.5.5.ebuild 1028 RMD160 7bf5947ff991c0615eace089cd109380efca8a77 SHA1 03c39280090f86f8499476db4e0f8513efc856c5 SHA256 96e37011e96ddf294e57ef97b649a3c6bf3fb0242d9e24d55d33f8a3b743b0d6
-EBUILD gallery-1.5.7.ebuild 1053 RMD160 dc2de42a0243d8a2a881d519655e74f152f289a4 SHA1 7618f68e7ee0d78d0355dd087d7c592ed1a34a7c SHA256 cd59658ca3466d0d39f6fceae05ef56669faacb0aeff3f2102c4bc3175d5cb3b
-EBUILD gallery-2.2.4.ebuild 2234 RMD160 2832a92df6cf37b2ada1182ee871ed19fa60b30d SHA1 f2adc83f45655ee65fd3356f67c896ef22e9c71e SHA256 f882a2276ffee56528dcf4eb789bb9b1c7c1fa55a0afb5fb4f03802b5c125051
-MISC ChangeLog 21138 RMD160 18f215ec60f9dbeb801a57a46a6558c6ae2b3e29 SHA1 cba177bca9a80f48a9b1e40aa759ea31484cd88d SHA256 7319307904d3d3b4295c9098e5c13eac0f6c7de80a7bf7279d37cb4ff5169497
-MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
+EBUILD gallery-1.5.3.ebuild 1212 RMD160 0fb64536dd3a1d087e40ada6e790e2d7f636f98f SHA1 fb389587f9ecd4ab85023021e06e432a73c7ef65 SHA256 4fe775283e7d8e44f80dc6e2c04852f494bf2ab9174b8098e33f44173a1ec99d
+EBUILD gallery-1.5.7.ebuild 1217 RMD160 c9985cc504105e6f176a3ce73d7ffeb58328757e SHA1 86b0dbcfcb5112840fe1ed2659755d9a6409b31f SHA256 eda845b8612f5fe6b46ce4c986b11a59e65c1b5b19857f61fba27251faa07ed6
+EBUILD gallery-2.2.4.ebuild 2175 RMD160 02248cf0a87e23374447656c59ff57ab4c07ce9a SHA1 d813a71e73f9da427ba1b94c6f23e146d0820b29 SHA256 0cff0fec5a1962a97046c16e299583ff20e8acf978fcc9438bb7c2593c139962
+MISC ChangeLog 21503 RMD160 74fbf5798a8b1ab575f94a97b09386e1360ff8ec SHA1 d6a2567dfa98bd9e7cdd15c80634dfbdd8ec9db7 SHA256 4d995507b8ffbbc903e7e563d2c884839b555d63674f57b55c07d2ec2cbf3946
+MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeofR4ACgkQmPFBzbX68WEOXwCffYnrv7aVDVmIx1hoypoZKSSc
-/PEAn0fsz52DL4QPuV1Q5B9mc9ET0F0x
-=baTR
+iEYEARECAAYFAke8bHkACgkQmPFBzbX68WHeHgCfeOMVSRf+eZroGAiTs5RNIhJ8
+HkQAn0PBb222WXSBsbNC+/a0vdhzoH0d
+=JK44
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/gallery-1.5.3.ebuild b/www-apps/gallery/gallery-1.5.3.ebuild
index 0a5c91a83686..b011279121d9 100644
--- a/www-apps/gallery/gallery-1.5.3.ebuild
+++ b/www-apps/gallery/gallery-1.5.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.3.ebuild,v 1.10 2008/02/05 15:13:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.3.ebuild,v 1.11 2008/02/20 18:07:42 hollow Exp $
 
-inherit webapp depend.apache
+inherit webapp depend.php confutils
 
 DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
 HOMEPAGE="http://gallery.sourceforge.net/"
@@ -12,28 +12,38 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="imagemagick netpbm unzip zip"
 
-RDEPEND="virtual/php
-	media-libs/jpeg
-	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
+RDEPEND="media-libs/jpeg
 	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
-need_apache2
+need_php_httpd
+
+S="${WORKDIR}"/${PN}
 
-S=${WORKDIR}/${PN}
+pkg_setup() {
+	webapp_pkg_setup
+	confutils_require_any imagemagick netpbm
+	require_php_with_use pcre session
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	gunzip ChangeLog.archive.gz
+}
 
 src_install() {
 	webapp_src_preinst
 
-	cp -R * ${D}/${MY_HTDOCSDIR}
-	for file in AUTHORS ChangeLog README ChangeLog.archive.gz; do
-		dodoc ${file}
-		rm -f ${D}/${MY_HTDOCSDIR}/${file}
-	done
+	dodoc AUTHORS ChangeLog ChangeLog.archive README
 	dohtml docs/*
+	rm -rf AUTHORS ChangeLog ChangeLog.archive README LICENSE.txt docs/
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
 }
diff --git a/www-apps/gallery/gallery-1.5.5.ebuild b/www-apps/gallery/gallery-1.5.5.ebuild
deleted file mode 100644
index e330630ec3b5..000000000000
--- a/www-apps/gallery/gallery-1.5.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.5.ebuild,v 1.4 2008/02/05 15:13:28 hollow Exp $
-
-inherit webapp depend.apache
-
-DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
-HOMEPAGE="http://gallery.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="imagemagick netpbm unzip zip"
-
-RDEPEND="virtual/php
-	media-libs/jpeg
-	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
-	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
-	unzip? ( app-arch/unzip )
-	zip? ( app-arch/zip )"
-
-need_apache2
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	cp -R * ${D}/${MY_HTDOCSDIR}
-	for file in AUTHORS ChangeLog README ChangeLog.archive.gz; do
-		dodoc ${file}
-		rm -f ${D}/${MY_HTDOCSDIR}/${file}
-	done
-	dohtml docs/*
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/gallery/gallery-1.5.7.ebuild b/www-apps/gallery/gallery-1.5.7.ebuild
index 312084a19a2c..e7f7b2d7cb07 100644
--- a/www-apps/gallery/gallery-1.5.7.ebuild
+++ b/www-apps/gallery/gallery-1.5.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.7.ebuild,v 1.2 2008/02/05 15:13:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.7.ebuild,v 1.3 2008/02/20 18:07:42 hollow Exp $
 
-inherit webapp depend.apache
+inherit webapp depend.php confutils
 
 DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
 HOMEPAGE="http://gallery.sourceforge.net/"
@@ -12,29 +12,38 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="imagemagick netpbm unzip zip"
 
-RDEPEND="virtual/httpd-cgi
-	virtual/php
-	media-libs/jpeg
-	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
+RDEPEND="media-libs/jpeg
 	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
 	unzip? ( app-arch/unzip )
 	zip? ( app-arch/zip )"
 
-need_apache2
+need_php_httpd
+
+S="${WORKDIR}"/${PN}
 
-S=${WORKDIR}/${PN}
+pkg_setup() {
+	webapp_pkg_setup
+	confutils_require_any imagemagick netpbm
+	require_php_with_use pcre session
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	gunzip ChangeLog.archive.gz
+}
 
 src_install() {
 	webapp_src_preinst
 
-	cp -R * "${D}/${MY_HTDOCSDIR}"
-	for file in AUTHORS ChangeLog README ChangeLog.archive.gz; do
-		dodoc ${file}
-		rm -f "${D}/${MY_HTDOCSDIR}/${file}"
-	done
+	dodoc AUTHORS ChangeLog ChangeLog.archive README
 	dohtml docs/*
+	rm -rf AUTHORS ChangeLog ChangeLog.archive README LICENSE.txt docs/
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 	webapp_src_install
 }
diff --git a/www-apps/gallery/gallery-2.2.4.ebuild b/www-apps/gallery/gallery-2.2.4.ebuild
index bd5c843aa17d..e6a69a0f3fb8 100644
--- a/www-apps/gallery/gallery-2.2.4.ebuild
+++ b/www-apps/gallery/gallery-2.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.4.ebuild,v 1.8 2008/01/23 16:02:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.4.ebuild,v 1.9 2008/02/20 18:07:42 hollow Exp $
 
-inherit webapp eutils depend.php
+inherit webapp eutils depend.php confutils
 
 DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
 HOMEPAGE="http://gallery.sourceforge.net/"
@@ -12,61 +12,47 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="ffmpeg gd imagemagick mysql netpbm postgres raw unzip zip"
 
-RDEPEND="virtual/httpd-cgi
-	media-libs/jpeg
+RDEPEND="media-libs/jpeg
 	raw? ( >=media-gfx/dcraw-8.03 )
 	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
-	gd? ( >=media-libs/gd-2 )
 	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
 	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
 	unzip? ( app-arch/unzip )
-	zip? ( app-arch/zip )
-"
+	zip? ( app-arch/zip )"
 
-S=${WORKDIR}/${PN}2
+S="${WORKDIR}"/${PN}2
 
-need_php
+need_php_httpd
 
 pkg_setup() {
 	webapp_pkg_setup
+	confutils_require_any gd imagemagick netpbm
+	confutils_require_any mysql postgres
 
 	local php_flags="pcre session"
-	local DIE=
-
 	use mysql && php_flags="${php_flags} mysql"
 	use postgres && php_flags="${php_flags} postgres"
 
-	if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags}; then
-		DIE="yes"
-	fi
-	if use gd; then
-		if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
-			DIE="yes"
-		fi
-	fi
-
-	if [[ ${DIE} == "yes" ]]; then
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags} || \
+			( use gd && ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ) ; then
 		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
+		eerror "${PHP_PKG} needs to be re-installed with all of the following USE flags enabled:"
 		eerror
 		eerror "${php_flags}"
 		eerror
-		if use gd; then
-			eerror "as well as any of the following USE flags enabled:"
-			eerror
-			eerror "gd gd-external"
-			eerror
-		fi
-		die "Re-install ${PHP_PKG}"
+		use gd && eerror "as well as with either gd or gd-external USE flag enabled."
+		die "Re-install ${PHP_PKG}."
 	fi
 }
 
 src_install() {
 	webapp_src_preinst
 
-	cp -R * "${D}/${MY_HTDOCSDIR}"
 	dohtml README.html
+	rm README.html LICENSE MANIFEST
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
 
 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en2.txt
 	webapp_src_install
diff --git a/www-apps/gallery/metadata.xml b/www-apps/gallery/metadata.xml
index 13bc126c7d91..6632069b5aff 100644
--- a/www-apps/gallery/metadata.xml
+++ b/www-apps/gallery/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-<email>web-apps@gentoo.org</email>
-<name>Gentoo Web Application Packages Maintainers</name>
-</maintainer>
+	<herd>web-apps</herd>
 </pkgmetadata>