From e7705bab81488e27aa4a50e65b160344f3cbb29c Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Fri, 22 Feb 2008 16:34:03 +0000 Subject: ebuild cleanup wrt #208584 Package-Manager: portage-2.1.4.4 --- www-apps/tikiwiki/ChangeLog | 5 ++- www-apps/tikiwiki/Manifest | 14 +++++++-- www-apps/tikiwiki/tikiwiki-1.9.9.ebuild | 56 +++++++++++++++------------------ 3 files changed, 42 insertions(+), 33 deletions(-) (limited to 'www-apps/tikiwiki') diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog index 93ad0fa1e628..883079aba703 100644 --- a/www-apps/tikiwiki/ChangeLog +++ b/www-apps/tikiwiki/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apps/tikiwiki # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.54 2008/01/23 08:56:37 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.55 2008/02/22 16:34:03 hollow Exp $ + + 22 Feb 2008; Benedikt Böhm tikiwiki-1.9.9.ebuild: + ebuild cleanup wrt #208584 23 Jan 2008; Gunnar Wrobel -tikiwiki-1.9.8.3.ebuild: Removed insecure tikiwiki-1.9.8.3 (sec issue #203265). diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest index 35c46c479d9f..79b8b7694582 100644 --- a/www-apps/tikiwiki/Manifest +++ b/www-apps/tikiwiki/Manifest @@ -1,5 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX postinstall-en.txt 1396 RMD160 151da6a1f93f1df11d8d0ebac08bf22ec258612e SHA1 efd2d6aff5b8d57f8350cc4072555fa4f634eef4 SHA256 2b6d9b93ab840a7368810b76486050b54b260d40671b36b22a85c2cc6540f8ea DIST tikiwiki-1.9.9.tar.bz2 6645685 RMD160 7cb44191a1d19bfe7a3fd1e6c21b0318039f5a08 SHA1 7b7339c50d8fbe93db5d016551f7cd582420a4c3 SHA256 cd3c3489c4038f065b343296fc37b076812dfe9d9909a20de5049aff15e3a434 -EBUILD tikiwiki-1.9.9.ebuild 2010 RMD160 20996634627bed37af83e0a64a2762884f5a3929 SHA1 5065a3af2e0e889ecc4a4dae9cd31e79e2ea3f1a SHA256 8cd746b635c75716f87f343b79fcbe7e7dac32dc48c330742bf39e3c36d68a20 -MISC ChangeLog 9691 RMD160 5703418404b07ce8ae8ebba24ef26fa8567eee3f SHA1 bbaf7b1473b67dbd69dc6d623f40de4d56d67e4f SHA256 58d3a9109895aed27d02baed3f68cd15920fb4d24d9acd917f63a5cc8fbb7345 +EBUILD tikiwiki-1.9.9.ebuild 1963 RMD160 231660d57f3d3ba94cff4d327580ae554aa6e4d5 SHA1 bcf87a17eedf1efe97f5cfa7b4e67c8b826c354e SHA256 da1bc6275dc8f35b28e6c0e4d189a00d48eebf95e2d55db6a112e9f6f39d000b +MISC ChangeLog 9794 RMD160 1a550999d484d51db05fcd52fe02e872c01a61cd SHA1 80cfe7f14101f2bcfc0561f537561b5243a033ab SHA256 ba8e6c0c83f4552aa4b0e6cc741ba26910c876683a2e7afecc9d1a80e2aae9a0 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.8 (GNU/Linux) + +iEYEARECAAYFAke++YQACgkQmPFBzbX68WEPnwCfXnnoZP218H8BgHoWPvWbWCf5 +fbkAni/h5C38FNNkMyi9r7EqsBhFhj/r +=Z5mi +-----END PGP SIGNATURE----- diff --git a/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild b/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild index 11402ddb55b9..ca5b149a4859 100644 --- a/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild +++ b/www-apps/tikiwiki/tikiwiki-1.9.9.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/tikiwiki/tikiwiki-1.9.9.ebuild,v 1.2 2008/01/18 20:25:45 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.9.9.ebuild,v 1.3 2008/02/22 16:34:03 hollow Exp $ inherit webapp depend.php @@ -12,60 +12,56 @@ LICENSE="LGPL-2.1" IUSE="mysql postgres graphviz" KEYWORDS="~amd64 ppc ~sparc ~x86" -RDEPEND="virtual/httpd-cgi - graphviz? ( media-gfx/graphviz ) -" +RDEPEND="graphviz? ( media-gfx/graphviz )" +need_httpd_cgi need_php_httpd pkg_setup () { webapp_pkg_setup - use mysql && require_php_with_use mysql - use postgres && require_php_with_use postgres + + local my_flags= + use mysql && my_flags="${my_flags} mysql" + use postgres && my_flags="${my_flags} postgres" + + require_php_with_use ${my_flags} } src_install() { webapp_src_preinst - local DIR - local DIRENTRY - local DIRS="backups db dump files img/trackers img/wiki - img/wiki_up modules/cache temp - templates_c templates styles maps whelp mods - lib/Galaxia/processes" - - # Ensure that directories exist, some don't. - # (part of setup.sh) - for DIR in ${DIRS}; do - mkdir -p ${DIR} - done - # Remove the execute permission from the setup.sh script # and rename it. Its actions have been incorporated here. chmod a-x setup.sh mv setup.sh setup.sh.done - # Install the minimal doc (points to web page) - # - dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README + dodoc changelog.txt copyright.txt doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README + rm -rf changelog.txt copyright.txt doc/ INSTALL license.txt README + + insinto "${MY_HTDOCSDIR}" + doins -r . - # The bulk goes into htdocs - # but don't copy INSTALL and README - cp -pPR [[:lower:]]* "${D}"/"${MY_HTDOCSDIR}" + local DIR DIRENTRY + local DIRS="backups db dump files img/trackers img/wiki + img/wiki_up modules/cache temp + templates_c templates styles maps whelp mods + lib/Galaxia/processes" # Recursively set server ownership to allow server to write # This is the rough equivalent of the setup.sh script # provided in the distribution. # Note: Cannot use xargs or find -exec here because # these don't work with shell functions. - # + webapp_serverowned "${MY_HTDOCSDIR}" + webapp_serverowned "${MY_HTDOCSDIR}"/tiki-install.php + + # ensure that directories exist, some don't. + # (part of original setup.sh) for DIR in ${DIRS}; do - find ${DIR} | while read DIRENTRY; do - webapp_serverowned "${MY_HTDOCSDIR}"/${DIRENTRY} - done + dodir "${MY_HTDOCSDIR}/${DIR}" + webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}" done - webapp_serverowned "${MY_HTDOCSDIR}"/tiki-install.php webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt webapp_src_install -- cgit v1.2.3-65-gdbad