diff --git a/www-apps/flyspray/ChangeLog b/www-apps/flyspray/ChangeLog --- a/www-apps/flyspray/ChangeLog +++ b/www-apps/flyspray/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Dec 2009; Nathan Phillip Brink (ohnobinki) + flyspray-0.9.9.6.ebuild, + +files/flyspray-0.9.9.6-system-adodb.patch: + Fixed dependencies, patch to use system adodb, install httpd-writable + flyspray.conf.php + 12 Dec 2009; Nathan Phillip Brink (ohnobinki) +flyspray-0.9.9.6.ebuild, +files/postinstall-en.txt, +metadata.xml: diff --git a/www-apps/flyspray/Manifest b/www-apps/flyspray/Manifest --- a/www-apps/flyspray/Manifest +++ b/www-apps/flyspray/Manifest @@ -1,5 +1,7 @@ +AUX flyspray-0.9.9.6-system-adodb.patch 1397 RMD160 70b743edbcb7080af630d94f454c48ecf14fb406 SHA1 cb2298cc67ea75f38243f4431ffced56c7cf8760 SHA256 0a4c914a6bf263a14ac11f80c93c7d43515c76cdac264e879a6c31730cbb95e5 +AUX flyspray-0.9.9.6-system-adodb.patch~ 624 RMD160 a1413119434d1698d98fd27cee73dc11ca5acb5f SHA1 2d62489bb0facc42589b036c3ca987f78d5b844f SHA256 e155536959bbd8d0bdecc9446dc016e5c1f3da6126ee6a7c9e59e0034f9821a0 AUX postinstall-en.txt 317 RMD160 61fc8a45c4aaa3ddf633860e636298df5fc0fc6c SHA1 444bacb8f99062d6a21d5359dfdfefdad7ce3985 SHA256 a2bde939f95165ce41d23a524e291c3f1be3ff2e7426736e144877ea780fbaa4 DIST flyspray-0.9.9.6.zip 1573955 RMD160 dc56992c0a85662d71245400b50553e1dfd1dfc4 SHA1 3b0e8422081197998d7d83ee5fdb1d6a0fb4d90c SHA256 c5c728bb66aca8c8ded3533387a751a129a2096b230f9dd1c16f77d1767bbe6c -EBUILD flyspray-0.9.9.6.ebuild 977 RMD160 a2c9394e2e756a1bd4fa88cc7472ac15b83fc555 SHA1 e542a4ea79d5088ad8760fd7ca66ea1d4be6c29b SHA256 3bd54f384d2bf58eb49465e10fa5ae16f2255a6316742603d4946b8bacc8ea01 +EBUILD flyspray-0.9.9.6.ebuild 1132 RMD160 fa024b12e4699c9405f57513e046482e22afaa1d SHA1 6acdba8e2231674ad840dd6b3618268deed16b66 SHA256 156609e070301130b7aeda410c251838264136a098d2d82cb48451364b04bbad MISC ChangeLog 339 RMD160 f8db6821d262e7444328414db0b325c3693165e7 SHA1 7215c03cedee6bdf53ce4da7aeaa596bf55d6c18 SHA256 1d086d207914000d0dbe54a907947f269ecdfe95fb9c0b3e6b5c6021699b14de MISC metadata.xml 234 RMD160 843a67e65686268cfe220c45d0049279cdcad64c SHA1 36a01efc130b1914361f15723b98a8bf0c8d7c12 SHA256 552f3f8ed407cbaff8029bfaaeeb71aab3fbda5840e69ad6f880ba81e3563d4e diff --git a/www-apps/flyspray/files/flyspray-0.9.9.6-system-adodb.patch b/www-apps/flyspray/files/flyspray-0.9.9.6-system-adodb.patch new file mode 100644 --- /dev/null +++ b/www-apps/flyspray/files/flyspray-0.9.9.6-system-adodb.patch @@ -0,0 +1,39 @@ +diff -u /var/tmp/portage/www-apps/flyspray-0.9.9.6/work.x86/includes/class.database.php /tmp/buffer-content-5978U1d +--- a/includes/class.database.php 2009-04-19 10:22:30.000000000 -0400 ++++ b/includes/class.database.php 2009-12-14 18:54:57.000000000 -0500 +@@ -16,7 +16,8 @@ + die('Do not access this file directly.'); + } + +-require_once dirname(dirname(__FILE__)) . '/adodb/adodb.inc.php'; ++set_include_path(get_include_path() . ':' . dirname(dirname(__FILE__))); ++require_once 'adodb/adodb.inc.php'; + + class Database + { + +diff -u /var/tmp/portage/www-apps/flyspray-0.9.9.6/work.amd64/setup/index.php /tmp/buffer-content-5978h_j +--- a/setup/index.php 2009-04-24 20:20:26.000000000 -0400 ++++ b/setup/index.php 2009-12-14 19:33:48.000000000 -0500 +@@ -8,9 +8,9 @@ + + @set_time_limit(0); + session_start(); +-//do it fastest as possible. ++//do it as fast as possible. + ini_set('memory_limit', '64M'); +- ++set_include_path(get_include_path() . ':' . dirname(dirname(__FILE__))); + + if (is_readable ('../flyspray.conf.php') && count(parse_ini_file('../flyspray.conf.php')) > 0) + { +@@ -88,7 +88,7 @@ + function Setup() + { + // Look for ADOdb +- $this->mAdodbPath = APPLICATION_PATH . '/adodb/adodb.inc.php'; ++ $this->mAdodbPath = 'adodb/adodb.inc.php'; + $this->mProductName = 'Flyspray'; + $this->mMinPasswordLength = 8; + + diff --git a/www-apps/flyspray/flyspray-0.9.9.6.ebuild b/www-apps/flyspray/flyspray-0.9.9.6.ebuild --- a/www-apps/flyspray/flyspray-0.9.9.6.ebuild +++ b/www-apps/flyspray/flyspray-0.9.9.6.ebuild @@ -5,7 +5,7 @@ EAPI="2" # we need webapp's default pkg_setup() -inherit webapp +inherit eutils webapp DESCRIPTION="An uncomplicated web-based bug tracking system" HOMEPAGE="http://flyspray.org/" @@ -15,17 +15,22 @@ LICENSE="LGPL-2.1" KEYWORDS="~amd64" IUSE="graphviz" -COMMON_DEPEND="virtual/httpd-php[xml] +# need_apache and friends not used because they aren't EAPI="2" friendly +DEPEND="app-arch/unzip" +RDEPEND="graphviz? ( media-gfx/graphviz ) + virtual/httpd-php[xml] || ( virtual/httpd-php[mysql] virtual/httpd-php[mysqli] - virtual/httpd-php[postgres] )" -DEPEND="app-arch/unzip - ${COMMON_DEPEND}" -RDEPEND="graphviz? ( media-gfx/graphviz ) - ${COMMON_DEPEND}" + virtual/httpd-php[postgres] + dev-php/adodb" src_prepare () { + epatch "${FILESDIR}"/${P}-system-adodb.patch + mv htaccess.dist .htaccess || die + touch ${PN}.conf.php || die + + rm -r adodb || die "removing bundled dev-php/adodb" } src_install () { @@ -37,8 +42,8 @@ src_install () { insinto "${MY_HTDOCSDIR}" doins -r . || die - webapp_serverowned "${MY_HTDOCSDIR}"/{attachments,cache} - webapp_configfile "${MY_HTDOCSDIR}"/.htaccess + webapp_serverowned "${MY_HTDOCSDIR}"/{attachments,cache,${PN}.conf.php} + webapp_configfile "${MY_HTDOCSDIR}"/{.htaccess,${PN}.conf.php} webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt webapp_src_install