eapi bump, use EAPI2 features instead of built_with_use checks

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 222 insertions, 3 deletions

diff --git a/net-analyzer/base/ChangeLog b/net-analyzer/base/ChangeLog
index f7ccfd764a2f..872c334d7e8d 100644
--- a/net-analyzer/base/ChangeLog
+++ b/net-analyzer/base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/base
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.20 2009/05/26 17:03:47 arfrever Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.21 2010/09/11 14:49:57 mabi Exp $
+
+*base-1.4.1-r1 (11 Sep 2010)
+
+  11 Sep 2010; Matti Bickel <mabi@gentoo.org> +base-1.4.1-r1.ebuild:
+  eapi bump, use EAPI2 features instead of built_with_use checks
 
   26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   base-1.4.0.ebuild, base-1.4.1.ebuild:
diff --git a/net-analyzer/base/Manifest b/net-analyzer/base/Manifest
index 9ff2ff7ded1a..b850e5bf7f00 100644
--- a/net-analyzer/base/Manifest
+++ b/net-analyzer/base/Manifest
@@ -2,6 +2,7 @@ DIST base-1.4.0.tar.gz 921006 RMD160 61635079cbd90ca58761bbc5becb783b90aba76f SH
 DIST base-1.4.1.tar.gz 954823 RMD160 dec378e107843baba75545d161607f8506740b2a SHA1 cc779ac3fea50d9b5bbb806cd7f6aa5a09b39b9a SHA256 3d5ac560d62610f71fa9978a81ee391e6c4dcd33b5c15316e0eb1b4449a49b54
 DIST snortrules-pr-2.4.tar.gz 789097 RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 SHA1 b8b59754ccb59b1dcf324d2faa399326117a60e9 SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504
 EBUILD base-1.4.0.ebuild 7184 RMD160 8d8f54b9acee16db6eb73c52832cd9cad6edbd80 SHA1 a99cc2f4e49930aa90746e74cd1f86bec0960e8d SHA256 cc534b021b0b2e558ca161ca1b76483ac0400c0db46e86c40d205ac053c29ad9
+EBUILD base-1.4.1-r1.ebuild 6837 RMD160 583e43e17f6555b1d9d00d77cc3a19f7d19bd5f7 SHA1 00473a3f73c54205403a79383fb3b07a3f8627f2 SHA256 69cc73f32f33b18a2f3804737e54dfb2874037545d9e3e33e7f70778be6c59a8
 EBUILD base-1.4.1.ebuild 7224 RMD160 ef16166f008db247101497e72172b5fc78f7559a SHA1 5ba1551b405178c55a1ad7f4b33d45b087daa4d2 SHA256 36e1fabcefe4424a854b094e0b1114ad0afd90b10ca9e0eeb8b8823551079d1d
-MISC ChangeLog 3695 RMD160 38ca3e5b447e91224730725facc86e25903fffe0 SHA1 0c4cf9f126eec85fe8454c0d8d8fca43532f5ad2 SHA256 f84c89c08c664d15b4c5077dba64f75c6001b68dce6b627b808f21f6d3e48789
+MISC ChangeLog 3856 RMD160 ba36d68a114eab85e6195322c9163cd056d4f70a SHA1 ebbc63957ca32936bb077c51aa70620b3cfd82a9 SHA256 7e845350f3559a43878033c7d5949c5585a3ad1a818701382748e32585cf2252
 MISC metadata.xml 267 RMD160 c913a59512630e220806726ec79210152b7f8121 SHA1 51cec405577f36038414fc3824a31361c9b4aa4e SHA256 2b41d49c3358e9cd93369ec863bae1056a515f613d9555617e501930b05b07ba
diff --git a/net-analyzer/base/base-1.4.1-r1.ebuild b/net-analyzer/base/base-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..5f2503649e94
--- /dev/null
+++ b/net-analyzer/base/base-1.4.1-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/base-1.4.1-r1.ebuild,v 1.1 2010/09/11 14:49:57 mabi Exp $
+
+EAPI="2"
+
+inherit webapp versionator eutils depend.apache depend.php
+
+CONF_DIR="/etc/${PN}"
+CONF_OLD="base_conf.php.dist"
+CONF_NEW="base_conf.php"
+MIDDLEMAN="base_path.php"
+DBTYPES="mssql mysql oracle postgres"
+
+DESCRIPTION="A web-based front-end to the Snort IDS."
+HOMEPAGE="http://base.secureideas.net"
+SRC_URI="mirror://sourceforge/secureideas/${P}.tar.gz
+	signatures? ( http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz )"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+# SLOT is intentionally omitted because this package uses webapp-config
+IUSE="gd signatures ${DBTYPES}"
+
+# BASE *should* work with any php-driven web server, so only require Apache
+# when the user has an apache use-flag set.
+want_apache
+
+DEPEND=">=sys-libs/zlib-1.2.1-r3"
+RDEPEND="${DEPEND}
+	dev-lang/php:5[session,mssql?,mysql?,postgres?]
+	gd? ( dev-lang/php[gd] dev-lang/php[gd-external] )
+	dev-lang/php
+	dev-php/adodb
+	dev-php/PEAR-Mail
+	dev-php/PEAR-Mail_Mime
+	gd? ( >=dev-php/PEAR-PEAR-1.3.6-r1
+		>=dev-php/PEAR-Image_Color-1.0.2
+		>=dev-php/PEAR-Log-1.9.3
+		>=dev-php/PEAR-Numbers_Roman-0.2.0
+		>=dev-php/PEAR-Numbers_Words-0.14.0
+		>=dev-php/PEAR-Image_Canvas-0.2.4
+		>=dev-php/PEAR-Image_Graph-0.7.1 )"
+	# A local database isn't necessary, so only require one when the user
+	# has use-flags set for one of the supported DBs.
+	# Snort can also be installed on a remote system, so don't require it.
+
+# Require PHP.
+need_php5
+
+S="${WORKDIR}/${PN}-php4"
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	webapp_pkg_setup
+
+	# Set the group ownership for /etc/base/base_conf.php so it can be read by
+	# the user's web server.
+	if use apache2 ; then
+		HTTPD_GROUP="apache"
+	else
+		# Set a safe default group.
+		HTTPD_GROUP="root"
+	fi
+
+	# Check and setup selected DB type
+	dbtypecnt=0
+	for db in ${DBTYPES}; do
+		if use ${db}; then
+			if [ ${dbtypecnt} -eq 0 ]; then
+				BASE_DBTYPE=${db}
+				let dbtypecnt++
+			elif [ ${dbtypecnt} -ge 1 ]; then
+				ewarn "You set multiple database types in your USE flags."
+				ewarn "You will have to setup DBtype configuration manually."
+			fi
+		fi
+	done
+
+	if [ ${dbtypecnt} -eq 0 ]; then
+		ewarn "No database type selected in your USE flags."
+		ewarn "You will have to setup DBtype manually."
+	fi
+
+	if use oracle && ! has_version dev-lang/php[oci8-instant-client] ; then
+		ewarn "PHP with oci8-instant-client support not found!"
+		ewarn "It is your responsibility to ensure that PHP will work"
+		ewarn "with commercial Oracle implementation."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Help the user configure /etc/base/base_conf.php so BASE works out of the
+	# box in most environments. The user will still be warned to edit the
+	# file manually at the pkg_postinst() stage.
+	sed -i -e 's:$BASE_urlpath.*:$BASE_urlpath = "/base";:g' \
+		${CONF_OLD}
+
+	sed -i -e 's:$DBlib_path.*:$DBlib_path = "/usr/share/php5/adodb";:g' \
+			${CONF_OLD}
+
+	if [[ "${BASE_DBTYPE}" == "postgres" ]]; then
+		sed -i -e 's:$DBtype.*:$DBtype = "postgres";:g' \
+			${CONF_OLD}
+	fi
+	if [[ "${BASE_DBTYPE}" == "mssql" ]]; then
+		sed -i -e 's:$DBtype.*:$DBtype = "mssql";:g' \
+			${CONF_OLD}
+	fi
+	if [[ "${BASE_DBTYPE}" == "oracle" ]]; then
+		sed -i -e 's:$DBtype.*:$DBtype = "oci8";:g' \
+			${CONF_OLD}
+	fi
+
+	# Install the configuration files in the usual /etc/${PN} location so that
+	# etc-update functions properly (it also improves security somewhat, since
+	# the config file contains plain-text passwords and should not be located
+	# inside the web-root). This requires changing the BASE source a tad to
+	# recognize the new location for base_conf.php.
+	for PHP in *.php */*.php; do
+		sed -i -e "s:${CONF_NEW}:${MIDDLEMAN}:g" \
+			${CONF_OLD} "${PHP}"
+	done
+
+	# Create the file ${MIDDLEMAN} to determine the web-root and to change
+	# the location of "include" to /etc/base/base_conf.php.
+	echo "<?php" > ${MIDDLEMAN}
+	echo '  $BASE_path = dirname(__FILE__);' >> ${MIDDLEMAN}
+	echo "  include(\"${CONF_DIR}/${CONF_NEW}\");" >> ${MIDDLEMAN}
+	echo "?>" >> ${MIDDLEMAN}
+
+	# Delete the $BASE_path variable from the config file because we
+	# now handle it with ${MIDDLEMAN} created above.
+	sed -i -e 's:$BASE_path =.*::g' ${CONF_OLD}
+
+	# Modify the HTML headers so search engines don't index BASE.
+	sed -i -e \
+		's:<HEAD>:<HEAD>\n  <META name="robots" content="noindex,nofollow">:g' \
+			index.php
+	sed -i -e \
+		's:<HEAD>:<HEAD>\n  <META name="robots" content="noindex,nofollow">:g' \
+			base_main.php
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# Install the docs once in the standard /usr/share/doc/${PF}/DOCDESTREE
+	# location instead of installing them in every virtual host directory.
+	cd docs
+	dodoc *
+	if use signatures ; then
+		cd "${WORKDIR}"
+		insinto ${MY_HTDOCSDIR}/signatures
+		doins doc/signatures/*
+	fi
+	cd "${S}"
+	rm -rf docs
+
+	# Install the config files in the normal location (/etc/${PN}).
+	insinto ${CONF_DIR} || die "Unable to insinto ${CONF_DIR}"
+	doins ${CONF_OLD} || die "Unable to doins ${CONF_OLD}"
+	newins ${CONF_OLD} ${CONF_NEW} || die "Unable to create ${CONF_NEW}"
+
+	# Install BASE for webapp-config
+	insinto ${MY_HTDOCSDIR} || die "Unable to insinto ${MY_HTDOCSDIR}"
+	doins -r *
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	# Set the proper permissions on /etc/base/base_conf.php
+	chmod 640 ${CONF_DIR}/${CONF_NEW} || FPERMS="FALSE"
+	chown root:${HTTPD_GROUP} ${CONF_DIR}/${CONF_NEW} || FOWNERS="FALSE"
+
+	# Notify the user of any problems at the very end.
+	if [ "${HTTPD_GROUP}" == "root" ]; then
+			ewarn ""
+			ewarn "It looks like you are not using Apache"
+			ewarn "as your web server. For BASE to work properly, you will"
+			ewarn "need to change the ownership of ${CONF_DIR}/${CONF_NEW} to"
+			ewarn "root:[www user] To use Apache, add \"apache2\" to"
+			ewarn "your USE flags and re-emerge BASE."
+	fi
+	if [ "${FPERMS}" == "FALSE" ]; then
+			ewarn ""
+			ewarn "Unable to change the permissions on ${CONF_DIR}/${CONF_NEW}".
+			ewarn "Please change them manually by issuing:"
+			ewarn "chmod 640 ${CONF_DIR}/${CONF_NEW}"
+	fi
+	if [ "${FOWNERS}" == "FALSE" ]; then
+			ewarn ""
+			ewarn "Unable to change the group ownership of the file:"
+			ewarn "${CONF_DIR}/${CONF_NEW}"
+			ewarn "Please change this manually by issuing:"
+			ewarn "chown root:${HTTPD_GROUP} ${CONF_DIR}/${CONF_NEW}"
+	fi
+
+	elog ""
+	elog "You should edit \"${CONF_DIR}/${CONF_NEW}\" before using BASE."
+	elog ""
+	elog "To setup your initial database, direct your web browser to the"
+	elog "location you installed BASE/base_db_setup.php"
+	elog "You can find instructions in /usr/share/doc/${PF}/README"
+	elog "There is a guide at http://gentoo-wiki.com/HOWTO_Apache2_with_BASE"
+	elog ""
+}