From: Pacho Ramos Date: Sun, 21 Feb 2010 17:30:56 +0000 (+0000) Subject: Dropping 'extra' USE flag since x11-libs/gtk+extra is going to be removed X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a44a99c24edc08c2d3099aaf3759ce7cf9d138f;p=gentoo.git Dropping 'extra' USE flag since x11-libs/gtk+extra is going to be removed Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog index 4e37e8894a7d..29842c93412d 100644 --- a/dev-php5/php-gtk/ChangeLog +++ b/dev-php5/php-gtk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-php5/php-gtk -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.17 2009/09/13 10:20:21 eva Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.18 2010/02/21 17:30:56 pacho Exp $ + +*php-gtk-2.0.1-r2 (21 Feb 2010) + + 21 Feb 2010; Pacho Ramos -php-gtk-2.0.0.ebuild, + -php-gtk-2.0.1.ebuild, -php-gtk-2.0.1-r1.ebuild, +php-gtk-2.0.1-r2.ebuild, + metadata.xml: + Dropping 'extra' USE flag since x11-libs/gtk+extra is going to be removed, + see bug 292211 *php-gtk-2.0.1-r1 (13 Sep 2009) diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest index 70d70518afc9..f021326a2e28 100644 --- a/dev-php5/php-gtk/Manifest +++ b/dev-php5/php-gtk/Manifest @@ -4,22 +4,19 @@ Hash: SHA1 AUX no-cli-check.patch 391 RMD160 15754f4f2fe8a2e55c521a6301e1db2ac971ec31 SHA1 3a43d565115737c3292d4ae4779ca2f461ba6e85 SHA256 7d505e67ddf87808842dc0b747b12f99b60af74526bee3b59159ed8346449e23 AUX php-gtk-2.0.0-no-cli-check.patch 402 RMD160 82dcbd36ce596c98fed40523e4751a40fabbbf13 SHA1 d3acf2905959f6c5e7997e16efa96413d3887e6a SHA256 d6c0d4d541647c205d73b1f8e20747f2974c44494350cf59c0b24198f4462dab AUX php-gtk-2.0.1-gtkhtml314.patch 1044 RMD160 a790a6ebcd65f9b166fffa9290648c3bc640b9eb SHA1 97f181bce114ca5e1ed4b879d088cb38b9eedb55 SHA256 274bed612a837f23d5f129a5d44875896603f1c42a0e281c05822c50c1b17944 -DIST php-gtk-2.0.0.tar.gz 1022830 RMD160 de59554ba447c755ea64b805ba65eb24fad7efa8 SHA1 f9172ce64d85479d341c808b44a6127b164cd1a2 SHA256 711934fbdd6b84d8e2b78588f6b4ef9a4e9378e622a4e80279744ff6bded0718 DIST php-gtk-2.0.1.tar.gz 1254316 RMD160 2e305f45d95a2c1abbe8cd551c794823dfc3d919 SHA1 a4f42c715b51554c1322de4beb3054012ec58696 SHA256 996c79892f168e5f6b50ca2aaa1e925ec4ba4de8ad6d3b86dd2722ad4662cc0b DIST php_gtk_manual-20071130_bg.tar.bz2 871540 RMD160 5d2499ecc023ecff37d72bd32cbc3c5c6511926f SHA1 0f3c3d5aaf2596832a60b8aa6c2bbae137cdd9b4 SHA256 480a79abf3fda29f5bb22deca71110dc9be0ceedf7688df1bc4ba94254b23cbe DIST php_gtk_manual-20071130_en.tar.bz2 922621 RMD160 b654f1ee83a3608208005d60a8bd8480449855fa SHA1 f9e36b5f77020cfba97386e0439d4ebf34eac9e4 SHA256 9095b3205c2b411fe3b8f65cad00cb8648dec6581fcd678569e8cae09ceb17fc DIST php_gtk_manual-20071130_ja.tar.bz2 873089 RMD160 f34e2887a4890877b1582113fd07b399b0b72ceb SHA1 e01128053e96147a25b44a0aea24bef0023f2280 SHA256 3a990b8e156e88a06c70a6eab450600304132fc3670f4240a8a152413d333ccc DIST php_gtk_manual-20071130_pt_BR.tar.bz2 940444 RMD160 37fd4a08f8aadeec338481fd61d4f8c2bc831adc SHA1 b3cd5ce5e9e9c4ec5ab6db7b55063ce8f8ffd7eb SHA256 7dfecfafbc2f3e796f5deafbce5e389eba2877e453b3fd9fd69e3fc5c33df083 DIST php_gtk_manual-20071130_zh_CN.tar.bz2 869165 RMD160 3b3b51f3c4e1ca9827fc238e86e59a2b64d40d9e SHA1 091215691890cf8b51c2fea962fca18f8c845e05 SHA256 2c242e78b0de5253edafdc0df852cc32b2c9fa49878fa494dfe5e1df10790ae2 -EBUILD php-gtk-2.0.0.ebuild 3225 RMD160 363bfb217935bdbabcc0735ee2892e30c683fcdd SHA1 33607dd4ba7066b2dea22e0fb079443484fc1cc7 SHA256 0186a6abcc9803cdcc86054cfc5cd26dee3bb08b890ac09af0ab4a6723736484 -EBUILD php-gtk-2.0.1-r1.ebuild 3486 RMD160 422eaf7a6a7a2a0dfeeccad1c32e40d07dd81858 SHA1 b1c2e4191df30c79a069faa26aa0d0ffb291a86b SHA256 c66f11bfc144bb7b515bdf7cda32a40676ca2ba4a1c9cd9464f8affb3f37d9a9 -EBUILD php-gtk-2.0.1.ebuild 3346 RMD160 c873d2b00a87f622a5074865dd29c36333e161f2 SHA1 2170475534fc65506829fb98bd210a253f02f517 SHA256 9387c29db81a483bb1c8bfe200c5cb117a173f761c1829e979d781e455a3ad27 -MISC ChangeLog 3482 RMD160 192ab15f75158425f9db4e54e5d3da40ac04f652 SHA1 9726c897923d0ab4f8cd653cd7615839ec325c96 SHA256 4097eef0716a1fe5f5fe4a89adb01711c285478d6f0d53832a890cf1832d4a93 -MISC metadata.xml 615 RMD160 6c77c1cf573b0b4be97b099ce8de4442a5ab62db SHA1 3430e283c84c55a24e9a73c3f0312d6af9f9ffa3 SHA256 747706c673860b81a665ac1878c3a8addd661d111565153be458b42f8ccf323c +EBUILD php-gtk-2.0.1-r2.ebuild 3441 RMD160 fe86137741601530ff03142ecff192d01ee0b590 SHA1 853b4b7ed3ea481f6f2303b7122c56e5686e0307 SHA256 955287e349651aebea0ae3354ae2b6adee23ba539632a42fa935735a226b01af +MISC ChangeLog 3774 RMD160 5303f5628a0253fb9b51b047f620beef4dfc1ac5 SHA1 48c07b43e9db93b0c26a96bafd978698da6b1c65 SHA256 a03c6241b068d45f510d7c8f7a401db60181179b3e551bfad18d82727ce10be0 +MISC metadata.xml 561 RMD160 70336718c05f32cd7fa2d0f6c68c03a9e9174011 SHA1 3636adffca1aea7f969d7d797f7b033fc94726e0 SHA256 1ef6b61cbf37cee3ab157d5841d6abe860f52282129b5109d3d8c4ddd48c23fd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkqsx3EACgkQ1fmVwcYIWAZQIQCgnM2XYjaxikTD3ekM+hA5zqKp -2PEAnjhSKPLCdZQaMrHR8A26JCcy1JqU -=5qCP +iEYEARECAAYFAkuBbdkACgkQCaWpQKGI+9Rn6gCeIv9gAN+ndW4Vs5UWskGvm8h0 +5vIAn2HAhQ8xze2RSJDUmDZ8jZtXyqPH +=4+ZG -----END PGP SIGNATURE----- diff --git a/dev-php5/php-gtk/metadata.xml b/dev-php5/php-gtk/metadata.xml index c82175bac8df..4378d99dc5ef 100644 --- a/dev-php5/php-gtk/metadata.xml +++ b/dev-php5/php-gtk/metadata.xml @@ -7,7 +7,6 @@ providing the ability to write GUI applications in PHP. - Enable GtkExtra support Enable libglade support Enable libsexy support Enable GtkMozembed support diff --git a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0.ebuild deleted file mode 100644 index 49122a44679d..000000000000 --- a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2009 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.ebuild,v 1.4 2009/09/12 21:35:59 eva 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 - -DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library." -HOMEPAGE="http://gtk.php.net/" -SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz" -IUSE="debug doc examples extra +glade libsexy mozembed scintilla spell" -LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla" -SLOT="0" -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.9.0 - extra? ( >=x11-libs/gtk+extra-2.1.1 ) - glade? ( >=gnome-base/libglade-2.5.0 ) - libsexy? ( >=x11-libs/libsexy-0.1.10 ) - mozembed? ( >=www-client/mozilla-firefox-1.5.0 ) - spell? ( >=app-text/gtkspell-2.0.0 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9" - -pkg_setup() { - if use debug ; then - require_php_with_use cli pcre debug - else - if has_debug ; then - # PHP has debug enabled, but PHP-GTK doesn't! - eerror "Please enable the 'debug' USE flag in PHP-GTK." - eerror "This is needed to work with the debug version of PHP." - die "Enable 'debug' USE flag for dev-lang/php" - fi - require_php_with_use cli pcre - fi -} - -src_unpack() { - unpack ${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}"/${P}-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 -} - -src_compile() { - local GLCONF - use glade || GLCONF=" --without-libglade" - - # php-ext-source-r1_src_compile can't be used - has_php - addpredict /usr/share/snmp/mibs/.index - addpredict /session_mm_cli0.sem - ./buildconf - - econf $(use_with extra) \ - $(use_with libsexy) \ - $(use_with mozembed) \ - $(use_with spell) \ - $(use_with debug) \ - $(use_enable scintilla) \ - --without-html \ - --without-sourceview \ - ${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() { - 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 - - if use examples ; then - insinto /usr/share/doc/${CATEGORY}/${PF}/examples - doins -r "${S}"/demos/* - fi -} diff --git a/dev-php5/php-gtk/php-gtk-2.0.1-r1.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild similarity index 93% rename from dev-php5/php-gtk/php-gtk-2.0.1-r1.ebuild rename to dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild index c3d028ec582a..d06c4160ad18 100644 --- a/dev-php5/php-gtk/php-gtk-2.0.1-r1.ebuild +++ b/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.1-r1.ebuild,v 1.1 2009/09/13 10:20:21 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1-r2.ebuild,v 1.1 2010/02/21 17:30:56 pacho Exp $ EAPI="1" @@ -15,7 +15,7 @@ inherit php-ext-source-r1 DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library." HOMEPAGE="http://gtk.php.net/" SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz" -IUSE="debug doc examples extra +glade gtkhtml libsexy mozembed scintilla spell" +IUSE="debug doc examples +glade gtkhtml libsexy mozembed scintilla spell" LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -36,7 +36,6 @@ RDEPEND=">=dev-lang/php-5.1.2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8.0 >=dev-libs/atk-1.9.0 - extra? ( >=x11-libs/gtk+extra-2.1.1 ) glade? ( >=gnome-base/libglade-2.5.0 ) libsexy? ( >=x11-libs/libsexy-0.1.10 ) gtkhtml? ( gnome-extra/gtkhtml:3.14 ) @@ -93,7 +92,7 @@ src_unpack() { } src_compile() { - my_conf="$(use_with extra) \ + my_conf="--without-extra \ $(use_with gtkhtml html) \ $(use_with libsexy) \ $(use_with mozembed) \ diff --git a/dev-php5/php-gtk/php-gtk-2.0.1.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1.ebuild deleted file mode 100644 index d5581dfc81a7..000000000000 --- a/dev-php5/php-gtk/php-gtk-2.0.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2009 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.1.ebuild,v 1.3 2009/09/12 21:35:59 eva 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 - -DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library." -HOMEPAGE="http://gtk.php.net/" -SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz" -IUSE="debug doc examples extra +glade libsexy mozembed scintilla spell" -LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla" -SLOT="0" -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.9.0 - extra? ( >=x11-libs/gtk+extra-2.1.1 ) - glade? ( >=gnome-base/libglade-2.5.0 ) - libsexy? ( >=x11-libs/libsexy-0.1.10 ) - mozembed? ( >=www-client/mozilla-firefox-1.5.0 ) - spell? ( >=app-text/gtkspell-2.0.0 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9" - -pkg_setup() { - if use debug ; then - require_php_with_use cli pcre debug - else - if has_debug ; then - # PHP has debug enabled, but PHP-GTK doesn't! - eerror "Please enable the 'debug' USE flag in PHP-GTK." - eerror "This is needed to work with the debug version of PHP." - die "Enable 'debug' USE flag for dev-lang/php" - fi - require_php_with_use cli pcre - fi -} - -src_unpack() { - unpack ${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}"/${PN}-2.0.0-no-cli-check.patch - - # see bug 232538 for details: - # this is needed so that autoconf can find the m4 gtk files (non-standard - # location) - export AT_M4DIR="${S}" - # phpize will invoke autoconf/autoheader (which will fail); we are replacing - # these calls with dummies as we call eautoreconf shortly afterwards - # anyway - export PHP_AUTOCONF="true" - export PHP_AUTOHEADER="true" - php-ext-source-r1_phpize - - 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 -} - -src_compile() { - my_conf="$(use_with extra) \ - $(use_with libsexy) \ - $(use_with mozembed) \ - $(use_with spell) \ - $(use_enable debug) \ - $(use_enable scintilla) \ - --without-html \ - --without-sourceview \ - $(use glade || echo '--without-libglade')" - php-ext-source-r1_src_compile -} - -src_install() { - 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 - - if use examples ; then - insinto /usr/share/doc/${CATEGORY}/${PF}/examples - doins -r "${S}"/demos/* - fi -}