remove old files; add libapreq2 check; cleanup

(Portage version: 2.1.4.1)

5 files changed, 21 insertions, 88 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/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>