Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.5.2-r1.ebuild
Date: Tue, 07 Feb 2012 16:43:48
Message-Id: 20120207164338.486AE2004B@flycatcher.gentoo.org
1 dilfridge 12/02/07 16:43:38
2
3 Modified: ChangeLog cups-1.5.2-r1.ebuild
4 Log:
5 Drop php scripting support; it is unmaintained by upstream, has already been removed in trunk, and displays build failures with recent php. Bug 388105
6
7 (Portage version: 2.1.10.45/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.453 net-print/cups/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.453&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.453&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.452&r2=1.453
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
19 retrieving revision 1.452
20 retrieving revision 1.453
21 diff -u -r1.452 -r1.453
22 --- ChangeLog 7 Feb 2012 16:32:47 -0000 1.452
23 +++ ChangeLog 7 Feb 2012 16:43:38 -0000 1.453
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-print/cups
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.452 2012/02/07 16:32:47 dilfridge Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.453 2012/02/07 16:43:38 dilfridge Exp $
29 +
30 + 07 Feb 2012; Andreas K. Huettel <dilfridge@g.o> cups-1.5.2-r1.ebuild:
31 + Drop php scripting support; it is unmaintained by upstream, has already been
32 + removed in trunk, and displays build failures with recent php. Bug 388105
33
34 *cups-1.5.2-r1 (07 Feb 2012)
35
36
37
38
39 1.2 net-print/cups/cups-1.5.2-r1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild?r1=1.1&r2=1.2
44
45 Index: cups-1.5.2-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r1.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- cups-1.5.2-r1.ebuild 7 Feb 2012 16:32:47 -0000 1.1
52 +++ cups-1.5.2-r1.ebuild 7 Feb 2012 16:43:38 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $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 $
57 +# $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 $
58
59 EAPI=4
60
61 @@ -19,7 +19,7 @@
62 LICENSE="GPL-2"
63 SLOT="0"
64 KEYWORDS="~amd64 ~arm ~ppc ~x86"
65 -IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl php +png python slp +ssl static-libs +threads +tiff usb X xinetd"
66 +IUSE="acl dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd"
67
68 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
69 for X in ${LANGS} ; do
70 @@ -41,7 +41,6 @@
71 ldap? ( net-nds/openldap[ssl?,gnutls?] )
72 pam? ( virtual/pam )
73 perl? ( dev-lang/perl )
74 - php? ( dev-lang/php )
75 png? ( >=media-libs/libpng-1.4.3:0 )
76 slp? ( >=net-libs/openslp-1.0.4 )
77 ssl? (
78 @@ -185,7 +184,7 @@
79 $(use_enable usb libusb) \
80 $(use_with java) \
81 $(use_with perl) \
82 - $(use_with php) \
83 + --without-php \
84 $(use_with python) \
85 $(use_with xinetd xinetd /etc/xinetd.d) \
86 --enable-libpaper \
87 @@ -207,11 +206,6 @@
88 perl-module_src_prep
89 perl-module_src_compile
90 fi
91 -
92 - if use php ; then
93 - cd "${S}"/scripting/php
94 - emake
95 - fi
96 }
97
98 src_install() {
99 @@ -224,11 +218,6 @@
100 fixlocalpod
101 fi
102
103 - if use php ; then
104 - cd "${S}"/scripting/php
105 - emake DESTDIR="${D}" install || die "emake install for php bindings failed"
106 - fi
107 -
108 # clean out cups init scripts
109 rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}