diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-02-07 16:43:38 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-02-07 16:43:38 +0000 |
| commit | 0c0e404aaf0eca59844d50170bff9d5ccb74206e (patch) | |
| tree | 78bb321c8d6dadc4751da9d146f21541b454880e | |
| parent | Stable for HPPA (bug #396971). (diff) | |
| download | gentoo-2-0c0e404aaf0eca59844d50170bff9d5ccb74206e.tar.gz gentoo-2-0c0e404aaf0eca59844d50170bff9d5ccb74206e.tar.bz2 gentoo-2-0c0e404aaf0eca59844d50170bff9d5ccb74206e.zip | |
Drop php scripting support; it is unmaintained by upstream, has already been removed in trunk, and displays build failures with recent php. Bug 388105
(Portage version: 2.1.10.45/cvs/Linux x86_64)
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.5.2-r1.ebuild | 17 |
2 files changed, 8 insertions, 15 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 0847e7db32fb..fc1d067d114a 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.452 2012/02/07 16:32:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.453 2012/02/07 16:43:38 dilfridge Exp $ + + 07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r1.ebuild: + Drop php scripting support; it is unmaintained by upstream, has already been + removed in trunk, and displays build failures with recent php. Bug 388105 *cups-1.5.2-r1 (07 Feb 2012) diff --git a/net-print/cups/cups-1.5.2-r1.ebuild b/net-print/cups/cups-1.5.2-r1.ebuild index f116d1ef1a01..1345cddfd088 100644 --- a/net-print/cups/cups-1.5.2-r1.ebuild +++ b/net-print/cups/cups-1.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild,v 1.1 2012/02/07 16:32:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild,v 1.2 2012/02/07 16:43:38 dilfridge Exp $ EAPI=4 @@ -19,7 +19,7 @@ SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python slp +ssl static-libs +threads +tiff usb X xinetd" +IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd" LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW" for X in ${LANGS} ; do @@ -41,7 +41,6 @@ RDEPEND=" ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) - php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( @@ -185,7 +184,7 @@ src_configure() { $(use_enable usb libusb) \ $(use_with java) \ $(use_with perl) \ - $(use_with php) \ + --without-php \ $(use_with python) \ $(use_with xinetd xinetd /etc/xinetd.d) \ --enable-libpaper \ @@ -207,11 +206,6 @@ src_compile() { perl-module_src_prep perl-module_src_compile fi - - if use php ; then - cd "${S}"/scripting/php - emake - fi } src_install() { @@ -224,11 +218,6 @@ src_install() { fixlocalpod fi - if use php ; then - cd "${S}"/scripting/php - emake DESTDIR="${D}" install || die "emake install for php bindings failed" - fi - # clean out cups init scripts rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} |