Configures but does not build yet

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 55 insertions, 40 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/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...