From: Benedikt Boehm Date: Sun, 17 Feb 2008 23:28:43 +0000 (+0000) Subject: ebuild cleanup wrt #208584 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fa9e33e13fcb464e21fc5c60fb1aa602ed3a2eee;p=gentoo.git ebuild cleanup wrt #208584 Package-Manager: portage-2.1.4.1 --- diff --git a/www-apps/Apache-Gallery/Manifest b/www-apps/Apache-Gallery/Manifest index 0d1be34c0b6c..fc90ead4924c 100644 --- a/www-apps/Apache-Gallery/Manifest +++ b/www-apps/Apache-Gallery/Manifest @@ -5,12 +5,12 @@ AUX 76_apache2-gallery.conf 1442 RMD160 8f67efcebb0e340d65555088721c65a02d72b479 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 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 +MISC ChangeLog 6178 RMD160 7061a73060ac944d61f66c43a6a303df068a66aa SHA1 efd32be595a48ac061a2bf216fc1a145c09731fc SHA256 a59f53711f41803c0cc51ddd80aeffa116313ed1acfa383db6a191f1e8c6013f +MISC metadata.xml 181 RMD160 af88f163669813430b3d650fa158b5f33a6562dd SHA1 08d947d1595dafcf11a22587eb17e520c446dce5 SHA256 046edb9e5513f2ddbc639e18298360f042360e78237602d09b2b3765be173254 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.8 (GNU/Linux) -iEYEARECAAYFAke4gbMACgkQmPFBzbX68WHxmwCfU/H/BQeXMGX8P7ucGDWfd0mr -gAcAoJTPkCdAdn6ZRhQcV8uG+ACLYr6G -=jBID +iEYEARECAAYFAke4xEQACgkQmPFBzbX68WE/bACgjo3ZSa3a0s7BSbjESfiPPtGm +yk8AoIqNbP5XRWPLIRzKO74t74fHlM1T +=f9+M -----END PGP SIGNATURE----- diff --git a/www-apps/b2evolution/ChangeLog b/www-apps/b2evolution/ChangeLog index cce86d84b2a9..957da29d9dcb 100644 --- a/www-apps/b2evolution/ChangeLog +++ b/www-apps/b2evolution/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-apps/b2evolution # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.27 2008/02/15 11:38:29 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/ChangeLog,v 1.28 2008/02/17 23:28:43 hollow Exp $ + + 17 Feb 2008; Benedikt Böhm metadata.xml, + b2evolution-1.10.2.ebuild, b2evolution-1.10.3.ebuild, + b2evolution-2.4.0_rc2.ebuild: + ebuild cleanup wrt #208584 *b2evolution-2.4.0_rc2 (15 Feb 2008) *b2evolution-1.10.3 (15 Feb 2008) diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest index 672f4df2f321..0bee4e355003 100644 --- a/www-apps/b2evolution/Manifest +++ b/www-apps/b2evolution/Manifest @@ -6,15 +6,15 @@ AUX postupgrade-en.txt 214 RMD160 ba1b754812b59c158c9e89a3d4b6e174ec4791e2 SHA1 DIST b2evolution-1.10.2-2007-06-08.zip 2555991 RMD160 4670689fdfaa8ad550c34b2d805c53c5a7b572a3 SHA1 db548ee50248c134088aee829dab0c5daf6b25fb SHA256 d625ff54618a2a668dd8b7912495fb0fdb473efee33293d359b342aeb5545225 DIST b2evolution-1.10.3-2007-11-01.zip 2547297 RMD160 62261ff5a2f27ae85ff8df953b89b18a5169c770 SHA1 88c706b8de1475c3f3ab4fde6919448d41256d22 SHA256 d6a5c944acb9e4fc0f7c58f37fc72253641211388f22eb380b411a3ccd26dd99 DIST b2evolution-2.4.0-rc2-2008-01-23.zip 2916300 RMD160 8f835c5befd46123ed6abb6710783bb6efe52ea2 SHA1 b0720e0388f20a81c07951ec7cffeee829ca3762 SHA256 341cafb438beba8a940456a954d232b7667fc2f996478d4b73d029e5180608f5 -EBUILD b2evolution-1.10.2.ebuild 1486 RMD160 c0e8ceb7f528a9e9c0d46dccc5ee2841ae951b0d SHA1 fe3ec3c785ca5e980e1bc85038baf6db51e13c59 SHA256 d1783c0a97e5a00fcab2714d325ae5e998f8a43bad339eb58c5389b931a7084b -EBUILD b2evolution-1.10.3.ebuild 1367 RMD160 1ed6e5b9242c88a71ade88201667c2f5e9cc97c4 SHA1 18c72870db0a5b45edd7d2ecccccf6e281eb8d52 SHA256 81a362c960c6cea320f8fba813e6d6f78c63e15237d259025b66c46ae9ca471c -EBUILD b2evolution-2.4.0_rc2.ebuild 1430 RMD160 dffa2e7bed4a7d05bfe0c9cdaaa374057dc138fb SHA1 c66a5fcda76a1fc0514e28d896912678675a4448 SHA256 55cb78def5831d7abc37c133402a6c63ea52b73643e8310889431f5a39118ae0 -MISC ChangeLog 4610 RMD160 52328d9621385635d3a89ef62ddaa5656c17aa6b SHA1 8129a04403ab81adb9517a7b57aa9b230d868d31 SHA256 fd9036768767e23a6679ad6f402baab1537b777d2d56b869b12a9ded4f79d5eb -MISC metadata.xml 162 RMD160 4ad46c4acf987b979efc4e20f22d108995db9ba1 SHA1 265e5ffb0f8fd3228245177e07699137ed264f23 SHA256 19960a47b6e13100c93644c0f6cbe3a7529abb297ebf907f893a86dd8c2e3572 +EBUILD b2evolution-1.10.2.ebuild 1216 RMD160 bb7931a37409fa22bb550408c1bad233f014e1ec SHA1 c5bb73df212d139b57cc55a106db69aba227e741 SHA256 c21f93136a7b877fba25d25aa8d70e17bfa7189f77054c178f617366465fc9b7 +EBUILD b2evolution-1.10.3.ebuild 1210 RMD160 9ff67555ad25822afa43af2254796edf0045b950 SHA1 b45367b994d25a44574c42bf4e033ba7a7bf07ac SHA256 43ee7cba00a5db8289ac1afa7de941d7ba93037c7d28430dd28861eecc7e976b +EBUILD b2evolution-2.4.0_rc2.ebuild 1273 RMD160 85577bfe946312aea7184422cccad223b2598cf3 SHA1 994b4358ceb2099207c2c2c55c8ea52d25863951 SHA256 4fe0d75a0795c928aaf320245f5f1e7a177b68bdd99320af33e9af93dbfbfe69 +MISC ChangeLog 4792 RMD160 ff789f28cdebbaff23a5b5e99957182c3d2c520e SHA1 e4b30215dd7aa6a6779cefd5d62ed676d144190c SHA256 c09cc839380cfdaead5eaca48c96aad907b904c711dca418acb15a6d7809bdca +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) -iD8DBQFHtXm7EEcxCpcDQ74RApVsAJ9zhihp2k/H0qBoY0x3zAq43OJrnACgleT3 -R54VkoLvrN5Czdd1Wmhdl8A= -=Gv4Q +iEYEARECAAYFAke4wzUACgkQmPFBzbX68WEXGQCeNvyrMzjBOxrLR7a+004vjKh0 +ECQAni9lFxbiqMInERSl3uWWKpCXSg1w +=b1el -----END PGP SIGNATURE----- diff --git a/www-apps/b2evolution/b2evolution-1.10.2.ebuild b/www-apps/b2evolution/b2evolution-1.10.2.ebuild index 17e9bccf67d7..094a64e52608 100644 --- a/www-apps/b2evolution/b2evolution-1.10.2.ebuild +++ b/www-apps/b2evolution/b2evolution-1.10.2.ebuild @@ -1,58 +1,52 @@ -# 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/b2evolution/b2evolution-1.10.2.ebuild,v 1.5 2007/08/14 18:15:31 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.2.ebuild,v 1.6 2008/02/17 23:28:43 hollow Exp $ inherit webapp eutils depend.php -MY_EXT="-2007-06-08" +MY_EXT="2007-06-08" +MY_PV=${PV/_/-} DESCRIPTION="Multilingual multiuser multi-blog engine" HOMEPAGE="http://www.b2evolution.net" -SRC_URI="mirror://sourceforge/evocms/${P}${MY_EXT}.zip" +SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip" + LICENSE="GPL-2" KEYWORDS="alpha amd64 ppc x86" IUSE="" -RDEPEND="virtual/httpd-php" +RDEPEND="" DEPEND="${DEPEND} ${RDEPEND} app-arch/unzip" +need_php_httpd + S="${WORKDIR}/${PN}" pkg_setup() { webapp_pkg_setup has_php if [[ ${PHP_VERSION} == "4" ]]; then - require_php_with_use expat + require_php_with_use expat tokenizer mysql else - require_php_with_use xml + require_php_with_use xml tokenizer mysql fi } -pkg_setup() { - webapp_pkg_setup - require_php_with_use tokenizer mysql -} - src_install() { webapp_src_preinst - einfo "Installing main files" - cp -r blogs/* ${D}${MY_HTDOCSDIR} - einfo "Done" + insinto ${MY_HTDOCSDIR} + doins -r blogs/* - dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \ - doc/upgradefrom_mt.html + rm doc/*.*-*.html doc/*.src.html + dohtml doc/*.html - # Identify the configuration files that this app uses - # User can want to make changes to these! webapp_serverowned ${MY_HTDOCSDIR} webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php - # post-install instructions - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - # now strut stuff webapp_src_install } diff --git a/www-apps/b2evolution/b2evolution-1.10.3.ebuild b/www-apps/b2evolution/b2evolution-1.10.3.ebuild index 50efb9328288..957ab3d4ce8e 100644 --- a/www-apps/b2evolution/b2evolution-1.10.3.ebuild +++ b/www-apps/b2evolution/b2evolution-1.10.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.1 2008/02/15 11:38:29 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-1.10.3.ebuild,v 1.2 2008/02/17 23:28:43 hollow Exp $ inherit webapp eutils depend.php @@ -10,6 +10,7 @@ MY_PV=${PV/_/-} DESCRIPTION="Multilingual multiuser multi-blog engine" HOMEPAGE="http://www.b2evolution.net" SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip" + LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="" @@ -18,7 +19,7 @@ RDEPEND="" DEPEND="${RDEPEND} app-arch/unzip" -need_php +need_php_httpd S="${WORKDIR}/${PN}" @@ -35,14 +36,12 @@ pkg_setup() { src_install() { webapp_src_preinst - einfo "Installing main files" - cp -r blogs/* "${D}"${MY_HTDOCSDIR} - einfo "Done" + insinto ${MY_HTDOCSDIR} + doins -r blogs/* - dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \ - doc/upgradefrom_mt.html + rm doc/*.*-*.html doc/*.src.html + dohtml doc/*.html - # Identify the configuration files that this app uses webapp_serverowned ${MY_HTDOCSDIR} webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php diff --git a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild index fdbb7af5e326..bb9a99bd3334 100644 --- a/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild +++ b/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.1 2008/02/15 11:38:29 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/b2evolution/b2evolution-2.4.0_rc2.ebuild,v 1.2 2008/02/17 23:28:43 hollow Exp $ inherit webapp eutils depend.php @@ -10,6 +10,7 @@ MY_PV=${PV/_/-} DESCRIPTION="Multilingual multiuser multi-blog engine" HOMEPAGE="http://www.b2evolution.net" SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip" + LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="" @@ -18,7 +19,7 @@ RDEPEND="" DEPEND="${RDEPEND} app-arch/unzip" -need_php +need_php_httpd S="${WORKDIR}/${PN}" @@ -35,14 +36,12 @@ pkg_setup() { src_install() { webapp_src_preinst - einfo "Installing main files" - cp -r blogs/* "${D}"${MY_HTDOCSDIR} - einfo "Done" + insinto ${MY_HTDOCSDIR} + doins -r blogs/* - dodoc doc/license.txt doc/install_new.html doc/upgradefrom_b2evo.html doc/upgradefrom_b2.html \ - doc/upgradefrom_mt.html + rm doc/*.*-*.html doc/*.src.html + dohtml doc/*.html - # Identify the configuration files that this app uses webapp_serverowned ${MY_HTDOCSDIR} webapp_serverowned ${MY_HTDOCSDIR}/conf/_basic_config.php webapp_configfile ${MY_HTDOCSDIR}/conf/_{basic_config,advanced,locales,formatting,admin,stats,application}.php diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml index e125fba8f543..6632069b5aff 100644 --- a/www-apps/b2evolution/metadata.xml +++ b/www-apps/b2evolution/metadata.xml @@ -1,6 +1,5 @@ -web-apps + web-apps - diff --git a/www-apps/bugport/Manifest b/www-apps/bugport/Manifest index 132a040ce78b..4880ef56bc0a 100644 --- a/www-apps/bugport/Manifest +++ b/www-apps/bugport/Manifest @@ -5,12 +5,12 @@ DIST bugport_1.146.tar.gz 937751 RMD160 9668a6d3a9508dbec2cbe5c25a8dc2e63cafbb1e DIST bugport_1.147.tar.gz 937810 RMD160 ff202a1b65b10a5274a6c471fa148d1de4a1110a SHA1 200c951f1884950c89525f790254454499bcb4e1 SHA256 d99a8af2cecfdf2cb276fc3c886efc7bf74e383ea65b23eb350a8e3db529997c EBUILD bugport-1.146.ebuild 1735 RMD160 c669bbe23c79a3712497af8c9354aba7aab30418 SHA1 66b943ad096356edf899310dec5eb793bc20a47d SHA256 d281bdf07e7a571d4d6505ecc3454e6ee5a7b9018730f2b63dcfa3e12d359d05 EBUILD bugport-1.147.ebuild 1954 RMD160 ddcf625ba9ee42688fb2d646c93fd9f6ca943d95 SHA1 00190c760ebc900842c418ad8e10b4a1f29e9263 SHA256 b062f98b686971068d9d742d34e5b9d100dfb09a191c3a7bb090fca79c180d43 -MISC ChangeLog 1703 RMD160 99580b866267372e30dea286c9fdbf6cefef3368 SHA1 0c1460757d69aa195cbef188e85c3125b8158614 SHA256 bc969988b45f896103088e57953ce1152152933487881ed445f9ec5c9db375f7 -MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 +MISC ChangeLog 1783 RMD160 3d65ca529f491a740b728236217c02fbddd5ee7f SHA1 c99985d0fecff7b80a9f39a0c84b2ff4d1ec7e38 SHA256 4a3ffc25cbb23330832ae28962daf218277b1bacc73e33b7beb2e173cd7a8419 +MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.8 (GNU/Linux) -iEYEARECAAYFAke4oJEACgkQmPFBzbX68WEvjQCgjapdOMIetKjSiAt+uOLTMRs3 -dcMAnjXe7lCJ5xz0y8jZJtUcinzmEixh -=Jwrz +iEYEARECAAYFAke4w8wACgkQmPFBzbX68WHzpQCfVQtjjd8PaQhdiqet6wbXo8Lx +8RQAn2dp/mdu0DPcV6u0YlTiGSrU8Hzx +=EKLw -----END PGP SIGNATURE-----