Version bump, remove old

svn path=/experimental/; revision=842

4 files changed, 62 insertions, 41 deletions

diff --git a/sys-cluster/ganglia-webfrontend/ChangeLog b/sys-cluster/ganglia-webfrontend/ChangeLog
index 7a5125b..b8de761 100644
--- a/sys-cluster/ganglia-webfrontend/ChangeLog
+++ b/sys-cluster/ganglia-webfrontend/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for www-apps/ganglia-webfrontend
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Mar 2008; Jakub Moc <jakub@gentoo.org>
+  -ganglia-webfrontend-3.0.5.ebuild, +ganglia-webfrontend-3.0.6.ebuild:
+  Version bump, remove old
+
   25 Nov 2007; Jakub Moc <jakub@gentoo.org>
   -ganglia-webfrontend-3.0.4.ebuild, +ganglia-webfrontend-3.0.5.ebuild:
   Version bump, remove old
diff --git a/sys-cluster/ganglia-webfrontend/Manifest b/sys-cluster/ganglia-webfrontend/Manifest
index b395821..b520d0a 100644
--- a/sys-cluster/ganglia-webfrontend/Manifest
+++ b/sys-cluster/ganglia-webfrontend/Manifest
@@ -1,4 +1,4 @@
-DIST ganglia-3.0.5.tar.gz 2873137 RMD160 12f6daa940f59bfec773365848196881afbed564 SHA1 908433b215defa74cb405a16b71778f1c34078a6 SHA256 65ce5164acf788b8f24aa7a1eb14cdbf8a57bece3609aa8d46c829f1e96518dc
-EBUILD ganglia-webfrontend-3.0.5.ebuild 718 RMD160 6fa0876764caf57fd362f2ae584d67540a70f0c5 SHA1 011c2f5eb07718262fcd3baa5160526f09e25edc SHA256 279c2ef2b7a303565cd7c15796d2945f06b63ad5e619eecf2fee1f0326a15798
-MISC ChangeLog 942 RMD160 132dd6f6b8cbf87415da5add96924d950fd07b1e SHA1 b513e09e5f6acc2f6bcf2cd1eacece60bb2f89e2 SHA256 871f78de8f2de0d07178796a629af21564da71feca45f7fc7f9238d7c199411d
+DIST ganglia-3.0.6.tar.gz 2854746 RMD160 ef3b29af23bc3e30b58736e0e6c08f4047b6eb70 SHA1 5dd3cc3fe2eade8ae012bbafd65e40a7d29bc995 SHA256 590c0c5e1b7b7a27cc1234093cf8caaac6b000f8035d9985459aaa7dcf2c2cb5
+EBUILD ganglia-webfrontend-3.0.6.ebuild 1377 RMD160 80015c8f97e3de5e3c6aff1e2b4a0d2e83fd59e5 SHA1 a65a940d0f29fe702acf7c9196ae1c24cb204840 SHA256 a7cbf3b7bec6e301a8c9fa785d90bebca3136c3965a9ddc7ba78e8f29d3c7a1f
+MISC ChangeLog 1086 RMD160 92ceecc1d0c4d3d3e5dbc02b1c2b60ba733a73a2 SHA1 dcf1e9e3f69caf3cd626319f88a7ec9e54956abb SHA256 c41b4b650779ca0b2aa867ce00cba5c88a5cdb3f7255355e9e668443f6820f4b
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/sys-cluster/ganglia-webfrontend/ganglia-webfrontend-3.0.5.ebuild b/sys-cluster/ganglia-webfrontend/ganglia-webfrontend-3.0.5.ebuild
deleted file mode 100644
index f631e01..0000000
--- a/sys-cluster/ganglia-webfrontend/ganglia-webfrontend-3.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit webapp depend.php
-
-DESCRIPTION="Web front end for ganglia cluster monitoring software"
-HOMEPAGE="http://ganglia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ganglia/ganglia-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=sys-cluster/ganglia-3
-	virtual/httpd-cgi"
-
-need_php_httpd
-
-S=${WORKDIR}/ganglia-${PV}/web
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_gd
-}
-
-src_install () {
-	webapp_src_preinst
-
-	dodoc AUTHORS ChangeLog
-	rm -f AUTHORS ChangeLog COPYING Makefile.am
-
-	cp -R . "${D}"/${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf.php
-	webapp_src_install
-}
diff --git a/sys-cluster/ganglia-webfrontend/ganglia-webfrontend-3.0.6.ebuild b/sys-cluster/ganglia-webfrontend/ganglia-webfrontend-3.0.6.ebuild
new file mode 100644
index 0000000..94b75aa
--- /dev/null
+++ b/sys-cluster/ganglia-webfrontend/ganglia-webfrontend-3.0.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit webapp depend.php
+
+DESCRIPTION="Web front end for ganglia cluster monitoring software"
+HOMEPAGE="http://ganglia.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ganglia/ganglia-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="~sys-cluster/ganglia-${PV}"
+
+need_httpd_cgi
+need_php_httpd
+
+S=${WORKDIR}/ganglia-${PV}/web
+
+pkg_setup() {
+	webapp_pkg_setup
+	require_gd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	for var in GANGLIA_RELEASE_NAME GANGLIA_MAJOR_VERSION GANGLIA_MINOR_VERSION GANGLIA_MICRO_VERSION ; do
+		eval $(grep "${var}=" "${WORKDIR}"/ganglia-${PV}/configure.in)
+	done
+	sed -i -e "s:@GANGLIA_RELEASE_NAME@:${GANGLIA_RELEASE_NAME}:" \
+		-e "s:@GANGLIA_MAJOR_VERSION@:${GANGLIA_MAJOR_VERSION}:" \
+		-e "s:@GANGLIA_MINOR_VERSION@:${GANGLIA_MINOR_VERSION}:" \
+		-e "s:@GANGLIA_MICRO_VERSION@:${GANGLIA_MICRO_VERSION}:" \
+		-e "s:@GANGLIA_VERSION@:${GANGLIA_MAJOR_VERSION}.${GANGLIA_MINOR_VERSION}.${GANGLIA_MICRO_VERSION}:" \
+		version.php.in || die "sed failed"
+	mv version.php.in version.php
+}
+
+src_install () {
+	webapp_src_preinst
+
+	dodoc AUTHORS ChangeLog
+	rm -f AUTHORS ChangeLog COPYING Makefile.am
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf.php
+	webapp_src_install
+}