ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/coppermine/ChangeLog b/www-apps/coppermine/ChangeLog
index b111fc4f624c451cf5bf4ed9d0f366f6aaf7e2a1..8a6d685068e8efce840cba350e737a71b2d0302f 100644 (file)
--- a/www-apps/coppermine/ChangeLog
+++ b/www-apps/coppermine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/coppermine
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.22 2008/02/15 10:18:40 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/ChangeLog,v 1.23 2008/02/19 11:45:24 hollow Exp $
+
+  19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> coppermine-1.4.16.ebuild:
+  ebuild cleanup wrt #208584
 
 *coppermine-1.4.16 (15 Feb 2008)
 

diff --git a/www-apps/coppermine/Manifest b/www-apps/coppermine/Manifest
index ce4ac4f3e87bc20dcbe4b48bd1ca9627f34832f8..136ec82eee27ec32f38b045eee576110c498b1e5 100644 (file)
--- a/www-apps/coppermine/Manifest
+++ b/www-apps/coppermine/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX postinstall-en.txt 324 RMD160 a131bab96cad1a21b19d0bc50c8043163003e058 SHA1 ac33ae725215d7c8f0da61112947ff0d9c879d41 SHA256 075eb512676f2627b67fbfe4483462fe4801c50c62616f797342d8a64755c030
 DIST cpg1.4.16.zip 3844583 RMD160 018fea3266b9a591259ca8e834d4051d11e8012d SHA1 feb1cd4b35079ef5f383e4890d943e4d1324024b SHA256 f5e6901593c112ccb9fdf43ac55287af6a401dd49376ff78c9a89660b6fbe0d5
-EBUILD coppermine-1.4.16.ebuild 1416 RMD160 0baee47c103c67b32ea371d0c621a89965ee6a02 SHA1 630c1f07386c0f33bdce97afb7a32eba1099a20a SHA256 6fbf810c4214c8854d3932033dbd44344210466983f5066a6a200ec8f1c4cf39
-MISC ChangeLog 3525 RMD160 1ad637b885a530c6380a05dedaeea821b5c10f2a SHA1 e657985cfe5da6ca0f45472d1b16864e4e6efe3e SHA256 1ab8c11387f48b16ff84c70dc0be1de0131434c81984b8c89cda490cb5df180b
+EBUILD coppermine-1.4.16.ebuild 1105 RMD160 d1fc71afaab4a0be9a480ad5b4ee87698249def7 SHA1 8a79c5d1b1b9a631be88cdf81df1bfb86dfed893 SHA256 41be7e29fed245acbb50880f865f8654551d36f48e33fba16f95ac01636abadf
+MISC ChangeLog 3631 RMD160 dcc86cb467d3d60ace89dfc152e340043912d002 SHA1 c7c90422e3ec2c5c3fee4597147420b115f58ebe SHA256 8b68fd62707cd5d18f219eb96ac6f887ba851d434f33c064ea10fe76189153ba
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHtWcFEEcxCpcDQ74RAgdgAKCSYFhyMKbWKpOGP6rjPaTHw/bFWACeIX72
-Dyf704BA2TXpth/6CAp4qL0=
-=OukV
+iEYEARECAAYFAke6wV8ACgkQmPFBzbX68WE9SgCgmL1kKLLqoJ0pKN8xGdXK7nst
+xNYAnR6QkgmJkWdH2pylGsZdZyqf7gSZ
+=V63n
 -----END PGP SIGNATURE-----

diff --git a/www-apps/coppermine/coppermine-1.4.16.ebuild b/www-apps/coppermine/coppermine-1.4.16.ebuild
index 1022595e0838ca33592abce84d364461e72e3efb..df64fde03a5763abf62c2ad4d16b91a3e37f1554 100644 (file)
--- a/www-apps/coppermine/coppermine-1.4.16.ebuild
+++ b/www-apps/coppermine/coppermine-1.4.16.ebuild
@@ -1,55 +1,43 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.4.16.ebuild,v 1.1 2008/02/15 10:18:40 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.4.16.ebuild,v 1.2 2008/02/19 11:45:24 hollow Exp $
 
 inherit webapp versionator depend.php
 
-DESCRIPTION="Feature rich web picture gallery script written in PHP using GD or ImageMagick lib with a MySQL backend."
+DESCRIPTION="Web picture gallery written in PHP with a MySQL backend"
 HOMEPAGE="http://coppermine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/cpg${PV}.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="~sparc ~x86 ~amd64"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="imagemagick"
 
 DEPEND="app-arch/unzip"
+RDEPEND="imagemagick? ( media-gfx/imagemagick )"
 
-RDEPEND="virtual/httpd-cgi
-       imagemagick? ( media-gfx/imagemagick )"
+S="${WORKDIR}"/cpg$(delete_all_version_separators)
 
-S=${WORKDIR}/cpg$(delete_all_version_separators)
-
-need_php
+need_php_httpd
 
 pkg_setup() {
        webapp_pkg_setup
-       if ! PHPCHECKNODIE="yes" require_php_with_use mysql ; then
-               eerror
-               eerror "${PHP_PKG} needs to be re-installed with mysql USE-flag"
-               eerror
-               die "Re-install ${PHP_PKG}"
-       fi
+       require_php_with_use mysql
 }
 
 src_install() {
        webapp_src_preinst
 
-       local docs="CHANGELOG COPYING"
-       dodoc ${docs}
+       dodoc CHANGELOG README.txt
+       dohtml docs/*
+       rm -rf CHANGELOG README.txt COPYING docs/
 
-       einfo "Installing main files"
-       cp -r * "${D}${MY_HTDOCSDIR}"
-       einfo "Done"
+       insinto "${MY_HTDOCSDIR}"
+       doins -r .
 
-       # owned files
-       dodir "${MY_HTDOCSDIR}"/albums
-       webapp_serverowned "${MY_HTDOCSDIR}"/albums
-       webapp_serverowned "${MY_HTDOCSDIR}"/albums/userpics
-       webapp_serverowned "${MY_HTDOCSDIR}"/albums/edit
+       dodir "${MY_HTDOCSDIR}"/albums/{userpics,edit}
+       webapp_serverowned "${MY_HTDOCSDIR}"/albums{,/userpics,/edit}
        webapp_serverowned "${MY_HTDOCSDIR}"/include
 
-       dohtml docs/*
        webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
        webapp_src_install
 }