remove old files; add libapreq2 check; cleanup

Package-Manager: portage-2.1.4.1

6 files changed, 26 insertions, 96 deletions

diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
index 7d72a5217fdd..37e8c76032d1 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.12 2008/02/02 12:53:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild,v 1.13 2008/02/17 18:49:14 hollow 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/${MY_P}.tar.gz"
 HOMEPAGE="http://apachegallery.dk/"
@@ -15,6 +14,9 @@ LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha amd64 ppc sparc x86"
 IUSE=""
 
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
 S=${WORKDIR}/${MY_P}
 
 DEPEND="${DEPEND}
@@ -31,13 +33,18 @@ DEPEND="${DEPEND}
 
 need_apache2
 
+pkg_setup() {
+	if ! built_with_use --missing true www-apache/libapreq2 perl; then
+		die "www-apache/libapreq2 needs USE=perl for this package to work"
+	fi
+	webapp_pkg_setup
+}
+
 src_install() {
+	perl-module_src_install
 	webapp_src_preinst
-	dodoc Changes INSTALL README TODO UPGRADE
-
-	mydoc="INSTALL"
 
-	perl-module_src_install
+	dodoc Changes INSTALL README TODO UPGRADE
 
 	insinto "${MY_ICONSDIR}"/gallery
 	doins htdocs/*.png
@@ -47,6 +54,7 @@ src_install() {
 
 	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/default
 	doins templates/default/*
+
 	insinto "${MY_HOSTROOTDIR}"/${PN}/templates/new
 	doins templates/new/*
 
diff --git a/www-apps/Apache-Gallery/ChangeLog b/www-apps/Apache-Gallery/ChangeLog
index 179840e1011c..e55ebb66aac1 100644
--- a/www-apps/Apache-Gallery/ChangeLog
+++ b/www-apps/Apache-Gallery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/Apache-Gallery
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.31 2008/02/02 12:53:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/Apache-Gallery/ChangeLog,v 1.32 2008/02/17 18:49:14 hollow Exp $
+
+  17 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/76_apache-gallery.conf, -files/76_apache1-gallery.conf,
+  -files/apache-gallery.conf, Apache-Gallery-1.0_rc3.ebuild:
+  remove old files; add libapreq2 check; cleanup
 
   02 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
   Apache-Gallery-1.0_rc3.ebuild:
diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest
index 354008cef7ff..0d1be34c0b6c 100644
--- a/www-apps/Apache-Gallery/Manifest
+++ b/www-apps/Apache-Gallery/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 76_apache-gallery.conf 1461 RMD160 030e59073d909e3d9102c19b138bacf0634daa33 SHA1 f1feae51f9f8039198fb3f556cc32540955972e1 SHA256 9b4c23adf32a6f75525e1c46394b25d60d66e88e6837a5fda002e8f62513268c
-AUX 76_apache1-gallery.conf 738 RMD160 b8f7924d1e7932e24cd9f6a3aada68e90d16557f SHA1 83122406948b180a0732be458153b228207640e6 SHA256 2d45cf1d8979fb511b67e5592361eab2c6e82991bae6f7d47ba7c9cb5d545eca
 AUX 76_apache2-gallery.conf 1442 RMD160 8f67efcebb0e340d65555088721c65a02d72b479 SHA1 2cf79d18da5824d0e74e9fa231eaea8b18f69fd4 SHA256 f6c0099476bdec5f495e7de4cbdff088ed0ce01ef8993ba657a463cdb365a7ab
-AUX apache-gallery.conf 757 RMD160 bf624af252a3401281914b738cf332cf6f8e5f2e SHA1 ddc4c5586d73089eb3dfadfa6d58cd89c8972bc8 SHA256 e58154cd6feccb2d2560c428b0523f161377bc921768d79a863fdf1c6649fdea
 AUX postinstall-en.txt 90 RMD160 66f525195a80158ecca50bbf3628d5a9f8c53eeb SHA1 34e0b57ef25c318f8fee3a49be879193a889730a SHA256 d46f8343e97402107390a651ee3e31adfcd9034d9f88d4ae5dcc83061851dfc1
 DIST Apache-Gallery-1.0RC3.tar.gz 83891 RMD160 eeceea7a0a74ba01c02368a9d5b87f90405b4ac9 SHA1 c0590e860c4ec72f8d429cb6d0a609413d4d2a66 SHA256 9a7ab7566d811bb21dd27bc9a27cdcfb2c7a96c01727ad9a04313fc80e68e1f7
-EBUILD Apache-Gallery-1.0_rc3.ebuild 1416 RMD160 6e17b723e069fa37466ce69e8a3ad96defb4e490 SHA1 066d52557f710a85a56aa3e41aa251499ef8a0cf SHA256 6dc4cfacfe0b5891ed21d13e28f1e0e37ec1fdc246e40dd2e9713d65a450267f
-MISC ChangeLog 5859 RMD160 381417cf522f09691a4b327c2b0df6869e3b65a2 SHA1 723457aabbd44ae9ac7b0e88fc9d026a80bbc83c SHA256 18cd56059e93f89c1c564986fc392aed1b0c203c9806dbf1f85d2f93931d6a9a
+EBUILD Apache-Gallery-1.0_rc3.ebuild 1577 RMD160 b719c82ba11d30dae28acc74fa50a4cacdda3abe SHA1 a9db2832a6d7faaab6960280a5912a990b2fa6dd SHA256 0d4ef09c896fbfae702a9f85655a7b17ac3bb526d6edc9fefd53ca15fe2d3d27
+MISC ChangeLog 6085 RMD160 ede13772752a233e0bb7159259db13f62cc3b2c8 SHA1 4407ff518b12313ef516fe3524b35a3c9a8107fa SHA256 2510d26b80f8c9a223a09691add35cd5b4ce1f9d5e607943831dd9b438890d27
 MISC metadata.xml 444 RMD160 76bcdd678f035f6db8d3b4614ece057afdc3cdff SHA1 70dd1ad4455524fe9946dcde25aa614ce2a45837 SHA256 0ac26539638d4ffc9930bc7edc25018e360593d700345d7d0568ea131f987606
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkekZ+IACgkQmPFBzbX68WGb5wCgj2D/KrPjQ+ZgcOBa4BiLYcz0
-XZkAnjmXW8jwN4m53WzqT72scQ0p7YJu
-=LD1z
+iEYEARECAAYFAke4gbMACgkQmPFBzbX68WHxmwCfU/H/BQeXMGX8P7ucGDWfd0mr
+gAcAoJTPkCdAdn6ZRhQcV8uG+ACLYr6G
+=jBID
 -----END PGP SIGNATURE-----
diff --git a/www-apps/Apache-Gallery/files/76_apache-gallery.conf b/www-apps/Apache-Gallery/files/76_apache-gallery.conf
deleted file mode 100644
index 8ce0eb0c3c3d..000000000000
--- a/www-apps/Apache-Gallery/files/76_apache-gallery.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-##### Apache::Gallery configuration
-#
-# This is actually a virtual host definition with mod_perl directives
-# It might be a very good idea to disable mod_autoindex in apache[2].conf
-#
-
-#<VirtualHost 123.123.123.123>
-#  ServerName   gallery.yourdomain.org
-#  DocumentRoot /var/www/localhost/htdocs/data/pictures/
-#  ErrorLog     /var/log/gallery-error_log
-#  TransferLog  /var/log/gallery-access_log
-#  <IfDefine MODPERL2>
-#  PerlSetVar   GalleryTemplateDir '/var/www/localhost/Apache-Gallery/templates/default'
-#  PerlSetVar   GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash' 
-#  PerlSetVar   GallerySizes '640 1024 1600 2272'
-#  PerlSetVar   GalleryThumbnailSize '100x75'
-## If you have a copyright overlay image set the location of it
-#  PerlSetVar   GalleryCopyrightImage 'htdocs/c.png'
-## If you use Apache2 set the following "PerlOptions" too
-#  PerlOptions +GlobalRequest
-#  <Location />
-#   SetHandler        	modperl
-#   PerlResponseHandler Apache::Gallery
-#   Options -Indexes
-#   AllowOverride AuthConfig
-#   Order deny,allow
-#   Allow from all
-#  </Location>
-#  </IfDefine>
-## Allow access to cache
-#  <Directory /var/tmp/Apache-Gallery>
-#    Options -ALL
-#    AllowOverride None
-#    Order deny,allow
-#    Allow from all
-#  </Directory>
-## Give Apache an idea of where to find icons and css
-#  Alias /icons /var/www/localhost/icons
-#  Alias /gallery.css /var/www/localhost/Apache-Gallery/templates/default/gallery.css
-#</VirtualHost>
diff --git a/www-apps/Apache-Gallery/files/76_apache1-gallery.conf b/www-apps/Apache-Gallery/files/76_apache1-gallery.conf
deleted file mode 100644
index 1a23f1fdfdff..000000000000
--- a/www-apps/Apache-Gallery/files/76_apache1-gallery.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-##### Apache::Gallery configuration
-#
-# This is actually a virtual host definition with mod_perl directives
-#
-
-#<VirtualHost localhost>
-#  ServerName   localhost
-#  DocumentRoot /var/www/localhost/htdocs/data/pictures/
-#  ErrorLog     /var/log/gallery-error_log
-#  TransferLog  /var/log/gallery-access_log
-#  PerlSetVar   GalleryTemplateDir '/var/www/localhost/Apache-Gallery/templates'
-#  PerlSetVar   GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash' 
-#  PerlSetVar   GallerySizes '640 1024 1600 2272'
-#  PerlSetVar   GalleryThumbnailSize '100x75'
-#  PerlSetVar   GalleryCopyrightImage 'htdocs/c.png'
-#  <Location />
-#    SetHandler        perl-script
-#    PerlHandler       Apache::Gallery
-#  </Location>
-#</VirtualHost>
diff --git a/www-apps/Apache-Gallery/files/apache-gallery.conf b/www-apps/Apache-Gallery/files/apache-gallery.conf
deleted file mode 100644
index dfa55426b31c..000000000000
--- a/www-apps/Apache-Gallery/files/apache-gallery.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-##### Apache::Gallery configuration
-#
-# This is actually a virtual host definition with mod_perl directives
-#
-
-#<VirtualHost 123.123.123.123>
-#  ServerName   gallery.yourdomain.org
-#  DocumentRoot /var/www/localhost/htdocs/data/pictures/
-#  ErrorLog     /var/log/gallery-error_log
-#  TransferLog  /var/log/gallery-access_log
-#  PerlSetVar   GalleryTemplateDir '/var/www/localhost/Apache-Gallery/templates'
-#  PerlSetVar   GalleryInfo 'Picture Taken => DateTimeOriginal, Flash => Flash' 
-#  PerlSetVar   GallerySizes '640 1024 1600 2272'
-#  PerlSetVar   GalleryThumbnailSize '100x75'
-#  PerlSetVar   GalleryCopyrightImage 'htdocs/c.png'
-#  <Location />
-#    SetHandler        perl-script
-#    PerlHandler       Apache::Gallery
-#  </Location>
-#</VirtualHost>