ebuild cleanup wrt #208584

Package-Manager: portage-2.1.4.4

diff --git a/www-apps/xrms/ChangeLog b/www-apps/xrms/ChangeLog
index 6ac00e3765d59f613a4fcacf9f3d7b9bcddeeeec..992a67bd72820da3889314ec2f545ec435c4c84e 100644 (file)
--- a/www-apps/xrms/ChangeLog
+++ b/www-apps/xrms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/xrms
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/ChangeLog,v 1.2 2007/05/26 22:44:54 rl03 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/ChangeLog,v 1.3 2008/02/20 12:40:40 hollow Exp $
+
+  20 Feb 2008; Benedikt Böhm <hollow@gentoo.org> xrms-1.99.2.ebuild:
+  ebuild cleanup wrt #208584
 
   26 May 2007; Renat Lumpau <rl03@gentoo.org> xrms-1.99.2.ebuild:
   Drop USE="intl" per bug #174367.

diff --git a/www-apps/xrms/Manifest b/www-apps/xrms/Manifest
index 4f05a4352add7f002655e6a97c346b936dd24f31..6baa035f32c34885d406753e94e8f9e33e96952c 100644 (file)
--- a/www-apps/xrms/Manifest
+++ b/www-apps/xrms/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 478 RMD160 8a46d7338ce6fb2e4573255a18467fa6cdaba04e SHA1 49921bd028d4796b250b9d9c59d9c4f2dbad70cd SHA256 05e85e53e870b1ff7fea491977a37f519fa5199ca479a840d71d575d46aa3d8e
 AUX postupgrade-en.txt 284 RMD160 d681e14cf8c49021811a2855c1ed203c44646967 SHA1 309e914f2f197aa9938d02c18d75963df6a02311 SHA256 251e3b5e5bfdd717c9f3d1ad4e882096009675539e4dd80d43e1126ce79aa05e
 AUX reconfig 395 RMD160 f87b20dc59ad889fcadf32b7252212a9b0ae008c SHA1 d8211efc012919a307d84b8a0ecbf23dc7d00b7c SHA256 7f5178680f2b122222be3e94d358f810d2a0691d9cd8f58f386e904ff47780b8
 DIST xrms-2006-07-25-v1.99.2-.tar.gz 16694058 RMD160 c48bf7b27b6ecc08d07024097e01e597e9337c6f SHA1 0548abc0df385a1d32f236249298d820247987e3 SHA256 32a56175f1c5535bd5b1c9df5b991505f9f1bddd22db51a107142b5ae1fc29e0
-EBUILD xrms-1.99.2.ebuild 1700 RMD160 98b69e2d1531460256326e3d7f7a55bef30e9c6c SHA1 09ef9a7e865d2305b9dddddeb4490dde712cdc4b SHA256 138b4ed3070b3ac7129046ab91dd62ba565148edc7227095cf52716ad5c2ac9b
-MISC ChangeLog 498 RMD160 60918062db825e3049c9d3b8e5f57c8f159be21a SHA1 9c0c18e8e2fe69e26ae23c3256b57e262dc8fd1a SHA256 5b55f8b2b19962f6986f49d3ffa0341a2be7f3d0133e140a064d62af680b8eab
+EBUILD xrms-1.99.2.ebuild 1487 RMD160 a580d37309678f734f81f889d3f172b279c82013 SHA1 ab23e9fa53bc9ad8e984d6595a826ab01b92b203 SHA256 d4c0cb8717abd9b5b791299844ef499ff0ce9f53ba88ddbe807688b510cd70ec
+MISC ChangeLog 600 RMD160 43f2fffc444d99b29e2cb11ccaa58c07bdefda14 SHA1 b63a317afd5c919abc9b17ffd2e8f1576d7a08cb SHA256 c53d251bccc8bb3bc0e46b3a7b73fa917092035cc4e42c982a2175f70491ce4b
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke8H9IACgkQmPFBzbX68WFi7gCffSkOnqVoVY3Z/PQk74v+bvdf
+iLEAmgNx5UwooIRtgq8alvP3bFzkVDDi
+=BRy7
+-----END PGP SIGNATURE-----

diff --git a/www-apps/xrms/xrms-1.99.2.ebuild b/www-apps/xrms/xrms-1.99.2.ebuild
index 56e52d44875b0789707286212e92d67bd9b4e13a..a9f2f053a0ca550e3780fe6589bdf8cc30572b90 100644 (file)
--- a/www-apps/xrms/xrms-1.99.2.ebuild
+++ b/www-apps/xrms/xrms-1.99.2.ebuild
@@ -1,59 +1,60 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/xrms-1.99.2.ebuild,v 1.2 2007/05/26 22:44:54 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/xrms/xrms-1.99.2.ebuild,v 1.3 2008/02/20 12:40:40 hollow Exp $
 
-inherit webapp depend.php
+inherit webapp depend.php eutils
 
 MY_DATE="2006-07-25"
-DESCRIPTION="XRMS is a fully-integrated suite of web-based tools for Customer Relationship Management (CRM), Sales Force Automation (SFA), and Business Intelligence (BI) tools."
+
+DESCRIPTION="Advanced Customer Relationship Management (CRM) and Sales Force Automation (SFA) suite"
 HOMEPAGE="http://xrms.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}-v${PV}-.tar.gz"
 
 LICENSE="OSL-2.0"
-KEYWORDS="~x86"
-S="${WORKDIR}/${PN}"
-
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
-       >=virtual/php-4.3.0
-       dev-php/PEAR-PEAR
-"
+DEPEND=""
+RDEPEND="dev-php/PEAR-PEAR"
+
+need_php_httpd
+
+S="${WORKDIR}"/${PN}
 
 pkg_setup() {
        webapp_pkg_setup
-       local php_flags="mysql"
-       require_php_with_use ${php_flags}
+       require_php_with_use mysql
 }
 
 src_unpack() {
-       unpack ${A}; cd ${S}
-       # Remove .cvs* files and CVS directories
-       find -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+       unpack ${A}
+       cd "${S}"
+       ecvs_clean
 }
 
 src_install () {
        webapp_src_preinst
 
-       dodir "${MY_HOSTROOTDIR}/${PF}"
-       dodoc CHANGELOG README LICENSE install/INSTALL
+       dodoc CHANGELOG README install/INSTALL
+       rm -f CHANGELOG README install/INSTALL LICENSE
+
+       insinto "${MY_HOSTROOTDIR}"/${PF}/include
+       doins -r include/
+       rm -rf include/
 
-       cp -R . "${D}/${MY_HTDOCSDIR}"
-       mv "${D}/${MY_HTDOCSDIR}/include" "${D}/${MY_HOSTROOTDIR}/${PF}"
+       insinto "${MY_HTDOCSDIR}"
+       doins -r .
 
-       local files="export storage tmp"
-       for file in ${files}; do
-               webapp_serverowned "${MY_HTDOCSDIR}/${file}"
-       done
+       webapp_serverowned "${MY_HTDOCSDIR}"/{export,storage,tmp}
 
-       webapp_configfile "${MY_HOSTROOTDIR}/${PF}/include/vars.php"
-       webapp_configfile "${MY_HTDOCSDIR}/include-locations.inc"
-       webapp_configfile "${MY_HOSTROOTDIR}/${PF}/include/plugin-cfg.php"
-       webapp_configfile "${MY_HOSTROOTDIR}/${PF}/include/classes/SMTPs/SMTPs.ini.php"
+       webapp_configfile "${MY_HTDOCSDIR}"/include-locations.inc
+       webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/include/vars.php
+       webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/include/plugin-cfg.php
+       webapp_configfile "${MY_HOSTROOTDIR}"/${PF}/include/classes/SMTPs/SMTPs.ini.php
 
-       webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-       webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt"
-       webapp_hook_script "${FILESDIR}/reconfig"
+       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+       webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+       webapp_hook_script "${FILESDIR}"/reconfig
 
        webapp_src_install
 }