[gentoo-commits] dev/jmbsvicetto:master commit in: www-apps/horde/, eclass/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     f49a2dc850df62ecef8899d2d47d8159ded6b05e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 05:09:39 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 05:09:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=f49a2dc8

[www-apps/horde] Add initial ebuilds for live and snapshot versions.
More work on the eclass to support horde packages.

---
 eclass/horde-v2.eclass                             |   48 +++++++++++++-------
 www-apps/horde/Manifest                            |    5 ++-
 www-apps/horde/horde-4.0.13.ebuild                 |   10 ++---
 .../{horde-4.0.13.ebuild => horde-9998.ebuild}     |   10 ++---
 .../{horde-4.0.13.ebuild => horde-9999.ebuild}     |   10 ++---
 5 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/eclass/horde-v2.eclass b/eclass/horde-v2.eclass
index 7631a33..9cb9b5f 100644
--- a/eclass/horde-v2.eclass
+++ b/eclass/horde-v2.eclass
@@ -26,41 +26,55 @@
 # You set this via the ebuild to whatever branch you wish to grab a
 # snapshot of.  Typically this is 'HEAD' or 'RELENG'.
 
+# @ECLASS-VARIABLE: EHORDE_SNAP_PV
+# @DESCRIPTION:
+# The date of the snapshot to fetch
+
 # @ECLASS-VARIABLE: EHORDE_VCS
 # @DESCRIPTION:
 # Track whether this is a live version or not
 
-# This eclass requires at least EAPI-2
+# This eclass requires at least EAPI-3
 case ${EAPI:-0} in
-	4|3|2) : ;;
+	4|3) : ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-inherit webapp eutils php-pear-r1
-
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EHORDE_VCS="git-2"
-	inherit ${EHORDE_VCS}
 fi
 
+inherit webapp eutils php-pear-r1 ${EHORDE_VCS}
+
+HOMEPAGE="http://www.horde.org/${HORDE_PN}"
+LICENSE="LGPL-2"
+
 [[ -z ${HORDE_PN} ]] && HORDE_PN="${PN/horde-}"
 [[ -z ${HORDE_MAJ} ]] && HORDE_MAJ=""
 HORDE_P="${HORDE_PN}-${PV}"
 
-SRC_URI="http://pear.horde.org/get/${HORDE_P}.tgz"
-HOMEPAGE="http://www.horde.org/${HORDE_PN}"
-LICENSE="LGPL-2"
 S=${WORKDIR}/${HORDE_PN}${HORDE_MAJ}-${PV/_/-}
 
-if [[ ${PV} == 9998* ]] ; then
-	EHORDE_SNAP="true"
-#	EHORDE_SNAP_BRANCH=""
-	let date=$(date +%s)-24*60*60
-	EHORDE_SNAP_PV=$(date -s @${date} +%Y-%m-%d)
+case ${PV} in
+	*9999)
+		EGIT_REPO_URI="git://github.com/horde/${HORDE_PN}"
+		SRC_URI=""
+		RESTRICT="mirror"
+		;;
+	*9998)
+		EHORDE_SNAP="true"
+		if [[ -z ${EHORDE_SNAP_PV} ]]; then
+			let date=$(date +%s)-24*60*60
+			EHORDE_SNAP_PV=$(date -d @${date} +%Y-%m-%d)
+		fi
 
-	SRC_URI="http://ftp.horde.org/pub/snaps/${SNAP_PV}/${HORDE_PN}-git.tar.gz"
-	S=${WORKDIR}/${HORDE_PN}
-fi
+		SRC_URI="http://ftp.horde.org/pub/snaps/${EHORDE_SNAP_PV}/${HORDE_PN}-git.tar.gz"
+		S=${WORKDIR}/${HORDE_PN}
+		;;
+	*)
+		SRC_URI="http://pear.horde.org/get/${HORDE_P}.tgz"
+		;;
+esac
 
 IUSE="vhosts"
 

diff --git a/www-apps/horde/Manifest b/www-apps/horde/Manifest
index b483f1e..c70645e 100644
--- a/www-apps/horde/Manifest
+++ b/www-apps/horde/Manifest
@@ -1,3 +1,6 @@
 DIST horde-4.0.13.tgz 3933774 RMD160 9a7a812c7653009098f25038a5cf9487ec0b58ba SHA1 49c2e7a4088d258d42854f6177a5173c38f32343 SHA256 826cf64dd5d1e13774e308e7d8abe453647771be5787a3eee77f6e24817589fd
-EBUILD horde-4.0.13.ebuild 882 RMD160 19b2c8645eda7df1166346778f809a7861621ca6 SHA1 2bd8bef9001ef1e9f77bc618db8bfc1833c1204c SHA256 84578892d1931f9e4c21c16da3dbb65179b2d773dfbd83f60ed850c8fb20ac39
+DIST horde-git.tar.gz 3909669 RMD160 890d6a3633e4fd72b0fccfafebaa4022fc856f41 SHA1 54496288e31ec7da3ee2e52dfc57955d792086a3 SHA256 c2a279f6f170fd44b4c02ba4674d7ace88eda45e2f1094eb8d689e343f196973
+EBUILD horde-4.0.13.ebuild 768 RMD160 205d3ea8ead310547a6027f4d4204968f1a1e91b SHA1 cbd92059bd78d18057bab792c6a690e60d98ed59 SHA256 0d033728a6631e8b02aaf80affe00abbf6239ef121a0e4d6594896edf16fd4f3
+EBUILD horde-9998.ebuild 768 RMD160 205d3ea8ead310547a6027f4d4204968f1a1e91b SHA1 cbd92059bd78d18057bab792c6a690e60d98ed59 SHA256 0d033728a6631e8b02aaf80affe00abbf6239ef121a0e4d6594896edf16fd4f3
+EBUILD horde-9999.ebuild 768 RMD160 205d3ea8ead310547a6027f4d4204968f1a1e91b SHA1 cbd92059bd78d18057bab792c6a690e60d98ed59 SHA256 0d033728a6631e8b02aaf80affe00abbf6239ef121a0e4d6594896edf16fd4f3
 MISC metadata.xml 414 RMD160 61e5d45c11bb069bed25c203cb9134e054049710 SHA1 b286c2b943e7ee16fb6db20e2177e176b62ec550 SHA256 7b48c03004cdadcf8c8f53510079ff0254b12f9c7f30c2d0221f0f1d958ce613

diff --git a/www-apps/horde/horde-4.0.13.ebuild b/www-apps/horde/horde-4.0.13.ebuild
index 7afbd41..27ea928 100644
--- a/www-apps/horde/horde-4.0.13.ebuild
+++ b/www-apps/horde/horde-4.0.13.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.3.9.ebuild,v 1.7 2010/10/19 02:16:58 jer Exp $
+# $Header: $
 
 EAPI=4
 
 inherit horde-v2
 
 DESCRIPTION="Horde Application Framework"
-HOMEPAGE="http://www.horde.org/"
-
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="mysql"
 
 DEPEND=""
@@ -22,13 +20,13 @@ RDEPEND="dev-lang/php[session,xml]
 	mysql? ( dev-php/PEAR-DB )"
 
 src_unpack() {
-	horde_src_unpack
+	horde-v2_src_unpack
 	cd "${S}"
 	chmod 600 scripts/sql/create.*.sql #137510
 }
 
 pkg_postinst() {
-	horde_pkg_postinst
+	horde-v2_pkg_postinst
 	elog "Horde requires PHP to have:"
 	elog "    ==> 'short_open_tag enabled = On'"
 	elog "    ==> 'magic_quotes_runtime set = Off'"

diff --git a/www-apps/horde/horde-4.0.13.ebuild b/www-apps/horde/horde-9998.ebuild
similarity index 74%
copy from www-apps/horde/horde-4.0.13.ebuild
copy to www-apps/horde/horde-9998.ebuild
index 7afbd41..27ea928 100644
--- a/www-apps/horde/horde-4.0.13.ebuild
+++ b/www-apps/horde/horde-9998.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.3.9.ebuild,v 1.7 2010/10/19 02:16:58 jer Exp $
+# $Header: $
 
 EAPI=4
 
 inherit horde-v2
 
 DESCRIPTION="Horde Application Framework"
-HOMEPAGE="http://www.horde.org/"
-
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="mysql"
 
 DEPEND=""
@@ -22,13 +20,13 @@ RDEPEND="dev-lang/php[session,xml]
 	mysql? ( dev-php/PEAR-DB )"
 
 src_unpack() {
-	horde_src_unpack
+	horde-v2_src_unpack
 	cd "${S}"
 	chmod 600 scripts/sql/create.*.sql #137510
 }
 
 pkg_postinst() {
-	horde_pkg_postinst
+	horde-v2_pkg_postinst
 	elog "Horde requires PHP to have:"
 	elog "    ==> 'short_open_tag enabled = On'"
 	elog "    ==> 'magic_quotes_runtime set = Off'"

diff --git a/www-apps/horde/horde-4.0.13.ebuild b/www-apps/horde/horde-9999.ebuild
similarity index 74%
copy from www-apps/horde/horde-4.0.13.ebuild
copy to www-apps/horde/horde-9999.ebuild
index 7afbd41..27ea928 100644
--- a/www-apps/horde/horde-4.0.13.ebuild
+++ b/www-apps/horde/horde-9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horde/horde-3.3.9.ebuild,v 1.7 2010/10/19 02:16:58 jer Exp $
+# $Header: $
 
 EAPI=4
 
 inherit horde-v2
 
 DESCRIPTION="Horde Application Framework"
-HOMEPAGE="http://www.horde.org/"
-
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="mysql"
 
 DEPEND=""
@@ -22,13 +20,13 @@ RDEPEND="dev-lang/php[session,xml]
 	mysql? ( dev-php/PEAR-DB )"
 
 src_unpack() {
-	horde_src_unpack
+	horde-v2_src_unpack
 	cd "${S}"
 	chmod 600 scripts/sql/create.*.sql #137510
 }
 
 pkg_postinst() {
-	horde_pkg_postinst
+	horde-v2_pkg_postinst
 	elog "Horde requires PHP to have:"
 	elog "    ==> 'short_open_tag enabled = On'"
 	elog "    ==> 'magic_quotes_runtime set = Off'"