Configures but does not build yet

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 72 insertions, 55 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 6128ea1be5db..441dca8d3fd9 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # 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.474 2012/05/08 22:24:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.475 2012/05/08 23:00:40 dilfridge Exp $
+
+  08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/cups-1.6.0-dont-compress-manpages.patch,
+  +files/cups-1.6.0-fix-install-perms.patch, cups-9999.ebuild:
+  Configures but does not build yet
 
 *cups-9999 (08 May 2012)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 433d1008755b..97d03b147991 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -17,6 +17,8 @@ AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a
 AUX cups-1.5.2-linkperl.patch 724 RMD160 5e94f21ab236a88ec2026e69aed58ce17dafaa5c SHA1 8556aea40a07176b0daa184bcce1b1abe3d81c48 SHA256 48891623d98a1767c11865d59c72146aa277f1bd0abda9871ae90540676b648e
 AUX cups-1.5.2-threads.patch 730 RMD160 e021b2d2f5293fb58f24279f2550488f90dc91e5 SHA1 bc1b1a8048d36393995f056493b57f5022e6d854 SHA256 adb76ff55cd6857e7bc6c36e9cb9d63201fe14b0f853f52271b45a54ad07a710
 AUX cups-1.5.2-threads2.patch 3192 RMD160 9736e8b03458be45fd1f427d3726368e81d51539 SHA1 2d87e9fe0267f3d6192cc81d1410b5eb534af39d SHA256 07a495e49b7646bfbb0d9f12841f3db8ccd4493c69c8a626b96e913bca384f5c
+AUX cups-1.6.0-dont-compress-manpages.patch 435 RMD160 14221113caa783c63f04443580c013215660b73a SHA1 8ac8f95cf34c05a9b1bc3f8f5677f545ca71dc26 SHA256 d3e41e8d4a841ac71e5ed8598fc444a2f11b4c94215b55dcf5147694bbbc88c3
+AUX cups-1.6.0-fix-install-perms.patch 819 RMD160 3c1513f0ba782981552245f44c60f4290e52d42d SHA1 385f941cb7c20275f549cf93ca236e4bc976823d SHA256 ba3b550d4e007430a55a84f4311e36a6ea826b0d68f2c4d412fcbbb8babe81ac
 AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
@@ -27,23 +29,23 @@ EBUILD cups-1.4.8-r1.ebuild 7238 RMD160 bcaea5c73607b67db0ddf167028e478e570bb1d2
 EBUILD cups-1.4.8-r23.ebuild 8848 RMD160 0346363cf60979a04b7e626c396b8f558c47e868 SHA1 85dea1ec0d908183257675ac4748ceec57f7f72b SHA256 767556a6135e68aeaff967599dab0a6716c1d8cd0d1309ac8d8f12eadd118646
 EBUILD cups-1.5.2-r20.ebuild 8669 RMD160 a74d38a2fac85be7aeaf01f8cedc1518a3cfeb0b SHA1 386ef3ff391c4f567e356398ce5c15310dfdb25e SHA256 85891a3351dbd78ddbff19c82d05f59c387f3ee0902f2673cc5b70c66ba1e552
 EBUILD cups-1.5.2-r4.ebuild 8314 RMD160 ca98a87bce824f4fa1cf347ce53c485f8068f416 SHA1 fdd41190e50c2f1356acf0094813fa092b9af6b9 SHA256 0a5b2af35abc1680d405d2134e74a251748d314ccd8415c71a304193ae73cb50
-EBUILD cups-9999.ebuild 8664 RMD160 d26d9aa8834de5ccca02999e76b470c2f83a6259 SHA1 c70a9d4053805f9d1f8bf37fe2799b75d25b9362 SHA256 eb6c503906b3a2a182df2982df64fa02761a5d22a540a1e98f8169edce354a0c
-MISC ChangeLog 72146 RMD160 8babad62e1143aa47b1fcbdb1c687cdf4507b401 SHA1 bd5a343510e2f306636c2ff1ad2515b4da74d7f8 SHA256 614d856e64cacdf7d29e7a44a64ebb72b0f77e15810ed6c19baec58e93d5da80
+EBUILD cups-9999.ebuild 7807 RMD160 ac3e841edeec89193a1703eb8423072a2a9fb90a SHA1 8da56eb0e1d2c7500f75ea4509fc7721033c94f9 SHA256 f320677d3e8b484d6c2e39113e62739ea01302e0bc6dbe49cba82050aef6f3e6
+MISC ChangeLog 72353 RMD160 ac546d50287e25fa1d2fb26b2460cd1909a8a5dd SHA1 939dcf8a347a8aff4d0aa04dc8e799c9b7805aba SHA256 04a4de679123fbd0ab3a6c16b608baf8f9d65b7db2f3aae739867b7712f1a164
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPqZ0tAAoJENwGBM22xffeB+YP+wdsbBuCl02NPVYZERHGbGWM
-HhtpFUUuwWkwjIkTN2znylXi7XqhVqGGBxtgzxyrCr+Rsgzg0ZLoiZUmYOpXj9I3
-5cHlNgKDSumFpQsRrAsDnuRYScbQaierINPYU6eAAJCOb0mS9uzaBywsCf3YZmLb
-ZPdpjueDtGTqDqF2FTN2h3UhwJORAaiaTz+6ePdlgOEaL2KePCa3xOR5AwXsSSEs
-FBNHuQekyU+wdiLJORNmY7+XKf+doNAQdmi5xgHk5lj1E5G1ExY5bZTJC6WRsk/R
-4OUcueTMn8xWh9XyIZYrrdvemX9boAGVMLyL/sGSbtobPYLuVr2o0Qgc7vfqYaxO
-fdpvjYPCGG7TbSbjSo7EtP/XpK1jm+uAM+aU+IGjBok8Ob+VXISvunTAFeY552MY
-lMmyvMljQOCxDWvaqzKB0pdwDYEVNDv6KIcZhn6rd6KSTtfX9LHsb83xtPHhxRab
-vUtHbEfNch6PCdy1x3L9H9Wm1z7LJ9uHdqqutCQS4LSzKQRuEKWrww3yth8FpcbL
-78lcshRZHxuxWsFZ0kE29fTOSRp3+Iexr3Psk5DVbwF5VPGLZ+1y2c1erWUv2OkN
-3zEo5jyfK0dr6DpzEtKvjfCmuXWriGhQlwycqVfFxTpQs5OMnqR0fanmknRDEwHJ
-u+nosAj2kOc0ZTWoRE90
-=BrqG
+iQIcBAEBCgAGBQJPqaW5AAoJENwGBM22xffeShgP/RJX5piE75YfhiCwobu2YSR5
+U6+jnGd5+rZzjPIfcvZNWdIhMfxd+ucEwGLupSziOnW9uczt8JBW12JAqRHsICkY
+42nRIt5zEuUVE7DNb1IHCrsh0cywFvalv46DMC07qOxAPuILFG1izLVS2g9qk+Td
+gfhsGWYh/bZRjYrRBDCgvTgsVQQh8B59lItzP8GCdK8pa6stjlKeJPBHQJxwAhc+
+FxpH5W4BrirCC4mC/UK8tznqNzBXAoJBp8H0xm1iblvwsANzmTJ/F5L5MxAnS4jO
+pAnzdnQKThQf2/CQmF4jiu6VlhZoKg+TOXdARTzhNkdSZYskum18DBj3GlyAaH2i
+3YaveytLfScEcfNScChDSl+9oTKz1kv/+Gb3zrl+TX2s7c/8h/3xA6SMPIgYs++N
+bFkhzTBNs0E4YiQASRHvgCuuyRrbMnneglEHTJAM9d+FvZO97/Jkapd1NJg7CMNB
+kLU5yjOeAauRB+6cWFY3B3mL3idRh110MxmP9mll6xt6GGGdBC9oyXoOjR0rRaNm
+3R+Aom35yBKFqE73phicN6MjuYEKynbexOTo4mymg/Wa0xLIg30riwoIbRdtg4gA
+CuAqLp56Fc9tZLwj35Da7uS95tpOuUmW+GafLcGxcHwbV4tixebMzHYEjcriiyvN
+RiyEoXfozTNAE5S5QA/d
+=WRyy
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 44b942ac1f7b..7639bd9cb25f 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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-9999.ebuild,v 1.1 2012/05/08 22:24:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.2 2012/05/08 23:00:40 dilfridge Exp $
 
 EAPI=4
 
@@ -10,14 +10,14 @@ MY_P=${P/_}
 MY_PV=${PV/_}
 
 if [[ "${PV}" != "9999" ]]; then
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
+	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
 	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
 else
-	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd subversion
+	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd subversion
 	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
 	KEYWORDS=""
 fi
@@ -27,8 +27,8 @@ HOMEPAGE="http://www.cups.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
-	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
+IUSE="acl avahi dbus debug +filters gnutls java kerberos ldap pam
+	python slp +ssl static-libs systemd +threads 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
@@ -46,12 +46,9 @@ RDEPEND="
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg:0 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap[ssl?,gnutls?] )
 	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	png? ( >=media-libs/libpng-1.4.3:0 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
@@ -61,7 +58,6 @@ RDEPEND="
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
 	systemd? ( sys-apps/systemd )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
@@ -85,17 +81,10 @@ RESTRICT="test"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
-	"${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-	"${FILESDIR}/${PN}-1.5.2-linkperl.patch"
-	"${FILESDIR}/${PN}-1.5.2-threads.patch"
-	"${FILESDIR}/${PN}-1.5.2-threads2.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
-	"${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"		# revert ipp backend to 1.4 state
-	"${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"		# avahi support from debian
 	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
 )
 
@@ -189,18 +178,15 @@ src_configure() {
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
-		$(use_enable jpeg) \
 		$(use_enable kerberos gssapi) \
 		$(use_enable ldap) \
 		$(use_enable pam) \
-		$(use_enable png) \
 		$(use_enable slp) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
-		$(use_enable tiff) \
 		$(use_enable usb libusb) \
 		$(use_with java) \
-		$(use_with perl) \
+		--without-perl \
 		--without-php \
 		$(use_with python) \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
@@ -216,27 +202,10 @@ src_configure() {
 	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
 }
 
-src_compile() {
-	emake
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-}
-
 src_install() {
 	emake BUILDROOT="${D}" install
 	dodoc {CHANGES,CREDITS,README}.txt
 
-	if use perl ; then
-		pushd scripting/perl > /dev/null
-		perl-module_src_install
-		fixlocalpod
-		popd > /dev/null
-	fi
-
 	# clean out cups init scripts
 	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
 
diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
new file mode 100644
index 000000000000..62db46eea00d
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
@@ -0,0 +1,19 @@
+Index: config-scripts/cups-manpages.m4
+===================================================================
+--- config-scripts/cups-manpages.m4	(Revision 10458)
++++ config-scripts/cups-manpages.m4	(Arbeitskopie)
+@@ -69,10 +69,10 @@
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
new file mode 100644
index 000000000000..6d4dc227bf9c
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
@@ -0,0 +1,22 @@
+Index: Makedefs.in
+===================================================================
+--- Makedefs.in	(Revision 10458)
++++ Makedefs.in	(Arbeitskopie)
+@@ -40,14 +40,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
+ INSTALL_DATA	=	$(INSTALL) -c -m 444
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+ INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...