LICENSE fix from project overlay and version bump

(Portage version: 2.1.4_rc7)

4 files changed, 88 insertions, 43 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 3c7a26090449..66a66c54c907 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-php5/php-gtk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.9 2007/10/12 08:48:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.10 2007/12/06 01:23:39 jokey Exp $
+
+*php-gtk-2.0.0_beta-r1 (06 Dec 2007)
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org> -php-gtk-2.0.0_beta.ebuild,
+  +php-gtk-2.0.0_beta-r1.ebuild:
+  LICENSE fix from project overlay and version bump
+
+  30 Nov 2007; Jakub Moc <jakub@gentoo.org> +php-gtk-2.0.0_beta-r1.ebuild:
+  Add USE=doc to install the manual, get rid of eclass duplication in
+  src_install() and set PHPSAPILIST instead, get rid of nolibglade flag and
+  replace it with USE=glade (enabled by default via EAPI-1). Ebuild cleanup.
+  Fix LICENSE.
 
   12 Oct 2007; Rémi Cardona <remi@gentoo.org> php-gtk-2.0.0_beta.ebuild:
   update gtksourceview deps (see bug #195366)
diff --git a/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta b/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta
deleted file mode 100644
index 6316fb87082e..000000000000
--- a/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a02568508c2fb13bfc1b20802d8e702b php-gtk-2.0.0beta.tar.gz 1291728
-RMD160 107f030baa5bc3752a815eacb11a8fa2d8086780 php-gtk-2.0.0beta.tar.gz 1291728
-SHA256 9e43326859bb59f79a8e688bd1cb457a915829cf2a5a626f1a06395abb9b1430 php-gtk-2.0.0beta.tar.gz 1291728
diff --git a/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta-r1 b/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta-r1
new file mode 100644
index 000000000000..ab90fd030981
--- /dev/null
+++ b/dev-php5/php-gtk/files/digest-php-gtk-2.0.0_beta-r1
@@ -0,0 +1,18 @@
+MD5 a02568508c2fb13bfc1b20802d8e702b php-gtk-2.0.0beta.tar.gz 1291728
+RMD160 107f030baa5bc3752a815eacb11a8fa2d8086780 php-gtk-2.0.0beta.tar.gz 1291728
+SHA256 9e43326859bb59f79a8e688bd1cb457a915829cf2a5a626f1a06395abb9b1430 php-gtk-2.0.0beta.tar.gz 1291728
+MD5 b07cfb88a318f746904a8982376aa9d2 php_gtk_manual-20071130_bg.tar.bz2 871540
+RMD160 5d2499ecc023ecff37d72bd32cbc3c5c6511926f php_gtk_manual-20071130_bg.tar.bz2 871540
+SHA256 480a79abf3fda29f5bb22deca71110dc9be0ceedf7688df1bc4ba94254b23cbe php_gtk_manual-20071130_bg.tar.bz2 871540
+MD5 20846bab49f4c72bfec71e5b2554a7f3 php_gtk_manual-20071130_en.tar.bz2 922621
+RMD160 b654f1ee83a3608208005d60a8bd8480449855fa php_gtk_manual-20071130_en.tar.bz2 922621
+SHA256 9095b3205c2b411fe3b8f65cad00cb8648dec6581fcd678569e8cae09ceb17fc php_gtk_manual-20071130_en.tar.bz2 922621
+MD5 8f619f7e7e9c43bde671dd16d5798406 php_gtk_manual-20071130_ja.tar.bz2 873089
+RMD160 f34e2887a4890877b1582113fd07b399b0b72ceb php_gtk_manual-20071130_ja.tar.bz2 873089
+SHA256 3a990b8e156e88a06c70a6eab450600304132fc3670f4240a8a152413d333ccc php_gtk_manual-20071130_ja.tar.bz2 873089
+MD5 8dc220ce67c3aee87dddd105a3bcab9e php_gtk_manual-20071130_pt_BR.tar.bz2 940444
+RMD160 37fd4a08f8aadeec338481fd61d4f8c2bc831adc php_gtk_manual-20071130_pt_BR.tar.bz2 940444
+SHA256 7dfecfafbc2f3e796f5deafbce5e389eba2877e453b3fd9fd69e3fc5c33df083 php_gtk_manual-20071130_pt_BR.tar.bz2 940444
+MD5 8e9dc8b114b5cc64284b9cea36930cef php_gtk_manual-20071130_zh_CN.tar.bz2 869165
+RMD160 3b3b51f3c4e1ca9827fc238e86e59a2b64d40d9e php_gtk_manual-20071130_zh_CN.tar.bz2 869165
+SHA256 2c242e78b0de5253edafdc0df852cc32b2c9fa49878fa494dfe5e1df10790ae2 php_gtk_manual-20071130_zh_CN.tar.bz2 869165
diff --git a/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0_beta-r1.ebuild
index 87ac08223d94..e50925faf577 100644
--- a/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.0_beta-r1.ebuild
@@ -1,30 +1,45 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0_beta.ebuild,v 1.2 2007/10/12 08:48:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0_beta-r1.ebuild,v 1.1 2007/12/06 01:23:39 jokey Exp $
+
+EAPI="1"
 
 PHP_EXT_NAME="php_gtk2"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
+PHPSAPILIST="cli"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2"
 
 inherit php-ext-source-r1
 
-KEYWORDS="~amd64 ~x86"
+MY_P="${PN}-${PV/_beta/beta}"
 
 DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
 HOMEPAGE="http://gtk.php.net/"
-SRC_URI="http://gtk.php.net/distributions/${PN}-${PV/_beta/}beta.tar.gz"
-
-LICENSE="PHP"
+SRC_URI="http://gtk.php.net/distributions/${MY_P}.tar.gz"
+IUSE="debug doc extra +glade html libsexy mozembed scintilla sourceview spell"
+LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla"
 SLOT="0"
-IUSE="extra html libsexy mozembed sourceview spell scintilla debug nolibglade"
+KEYWORDS="~amd64 ~x86"
+
+MYDOC_PN="php_gtk_manual"
+MYDOC_PV="20071130"
+
+LANGS="bg en ja pt_BR zh_CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="${SRC_URI}
+		doc? ( linguas_${lang}? ( http://dev.gentooexperimental.org/~jakub/distfiles/${MYDOC_PN}-${MYDOC_PV}_${lang}.tar.bz2
+					    mirror://gentoo/${MYDOC_PN}-${MYDOC_PV}_${lang}.tar.bz2 ) )"
+done
 
 RDEPEND=">=dev-lang/php-5.1.2
 	>=x11-libs/gtk+-2.6.0
 	>=dev-libs/glib-2.6.0
 	>=x11-libs/pango-1.8.0
 	>=dev-libs/atk-1.6.0
-	!nolibglade? ( >=gnome-base/libglade-2.5.0 )
 	extra? ( >=x11-libs/gtk+extra-2.1.1 )
+	glade? ( >=gnome-base/libglade-2.5.0 )
 	html? ( >=gnome-extra/gtkhtml-3.10.0 )
 	libsexy? ( >=x11-libs/libsexy-0.1.10 )
 	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
@@ -33,11 +48,9 @@ RDEPEND=">=dev-lang/php-5.1.2
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
-S="${WORKDIR}/${PN}-${PV/_beta/}beta"
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	has_php
-	require_php_cli
 	if use debug ; then
 		require_php_with_use cli pcre debug
 	else
@@ -52,17 +65,28 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
-	# we already check for CLI
-	# in-built check creates troubke on suhosin
-	# based installations, so remove it
-	epatch ${FILESDIR}/no-cli-check.patch
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	cd "${S}"
+	# we already check for CLI and built-in check creates trouble 
+	# on suhosin-based installations, so we remove it
+	epatch "${FILESDIR}"/no-cli-check.patch
+
+	cd "${WORKDIR}"
+	for lang in ${LANGS} ; do
+		if use doc && use linguas_${lang} ; then
+			mkdir ${lang}
+			pushd ${lang} >/dev/null
+			unpack ${MYDOC_PN}-${MYDOC_PV}_${lang}.tar.bz2
+			popd >/dev/null
+		fi
+	done
+}
 
-	if use nolibglade ; then
-		GLCONF=" --disable-libglade"
-	else
-		GLCONF=""
-	fi
+src_compile() {
+	local GLCONF
+	use glade || GLCONF=" --disable-libglade"
 
 	# php-ext-source-r1_src_compile can't be used
 	has_php
@@ -78,29 +102,23 @@ src_compile() {
 		$(use_with spell) \
 		$(use_with debug) \
 		$(use_enable scintilla) \
-		${GLCONF} || die "configure failed!"
+		${GLCONF}
+
 	emake || die "make failed!"
 	mv -f "modules/${PHP_EXT_NAME}.so" "${WORKDIR}/${PHP_EXT_NAME}-default.so" || die "Unable to move extension"
 }
 
 src_install() {
-	# can't use php-ext-source-r1_src_install
-	# since it adds ini to apache2 too!
-	# concurrentmodphp not applicable
-	has_php
-	addpredict /usr/share/snmp/mibs/.index
-
-	insinto "${EXT_DIR}"
-	newins "${WORKDIR}/${PHP_EXT_NAME}-default.so" "${PHP_EXT_NAME}.so"
-
-	if [[ -f "/etc/php/cli-php${PHP_VERSION}/php.ini" ]] ; then
-		inifile="etc/php/cli-php${PHP_VERSION}/ext/${PHP_EXT_NAME}.ini"
-		inidir="${inifile/${PHP_EXT_NAME}.ini/}"
-		inidir="${inidir/ext/ext-active}"
-		dodir "/${inidir}"
-		dosym "/${inifile}" "/${inifile/ext/ext-active}"
+	php-ext-source-r1_src_install
+
+	if use doc; then
+		for lang in ${LANGS} ; do
+			if use linguas_${lang} ; then
+				ebegin "Installing ${lang} manual, will take a while"
+				insinto /usr/share/doc/${CATEGORY}/${PF}/manual-${lang}
+				doins -r "${WORKDIR}"/${lang}/html/*
+				eend $?
+			fi
+		done
 	fi
-	php-ext-base-r1_addtoinifile "extension" "${PHP_EXT_NAME}.so" "${inifile}" "Extension added"
-
-	dodoc-php AUTHORS ChangeLog INSTALL NEWS README README.KNOWN-ISSUES TODO2
 }