diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/cups/Manifest | 22 | ||||
| -rw-r--r-- | net-print/cups/cups-1.5_rc1.ebuild | 296 |
3 files changed, 319 insertions, 6 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 3baca96e0fd4..9e22a3f54970 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/cups # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.417 2011/06/17 02:21:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.418 2011/06/18 19:59:55 dilfridge Exp $ + +*cups-1.5_rc1 (18 Jun 2011) + + 18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.5_rc1.ebuild: + Package-masked version bump 17 Jun 2011; Jeroen Roovers <jer@gentoo.org> cups-1.4.6-r2.ebuild: Stable for HPPA (bug #333781). diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index e35376f15fb2..594669843258 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736 AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6 @@ -22,16 +22,28 @@ AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514 +DIST cups-1.5rc1-source.tar.bz2 4083416 RMD160 380160554012912bf8e22dc6f70fe6824c16bb13 SHA1 b46b3d0255fe6ed36d516a61c397d27b5efb7d13 SHA256 04d4f1e4a5ac4c9907c2a81fcbde6b6b87f852e85e410d145a08a964434a1697 EBUILD cups-1.3.11-r4.ebuild 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b EBUILD cups-1.4.6-r1.ebuild 8233 RMD160 c1e54729f812ef12b1327ae16ca5e73eb7af28b1 SHA1 fcb7e620b53ba1f05e16de310470372e6611516d SHA256 d916d0d01bb3e6c88029d8a0ecd783df0c6f542e00162087e9766ef20138ad42 EBUILD cups-1.4.6-r2.ebuild 7238 RMD160 199c9337825a7faa08b0816460669941bb1dd6ff SHA1 0954237e9cadf11e66b3b5414feb5474af224b70 SHA256 50e0e3b70fa168fd941cad3143e26ff3c1eebec479f92c0012ff46117a107a0f EBUILD cups-1.4.6-r21.ebuild 8509 RMD160 6178c8831132937a82ab0c5452c6f46e3b3d1879 SHA1 3f51dd19726a31c71c3fda6def94c112974434b9 SHA256 a10216bb3af633739ac6aefa06d4e89aa88690f774768bdf66a03b7569a09b16 -MISC ChangeLog 62706 RMD160 88e6eb11e7bfc62e12579eb7e9d138e136d56e10 SHA1 8f56dec0bb28a12bd5e4135be69d051056b3112d SHA256 992b183023a93cb00052e69265eb3891c434adce7c52c70cc7633be81760f3c4 +EBUILD cups-1.5_rc1.ebuild 8263 RMD160 7727146c2c5689275a36ce418f11a4b946b763c7 SHA1 0c2ff34ef7e55ee3c080f17c50be1cee8a8d5f67 SHA256 3020afe678e46f54273cc4f712056829ee3bde8045ee8cded8791558f3846566 +MISC ChangeLog 62851 RMD160 67aa18b9fead4cb309e49daa39ef2de49d624cf8 SHA1 037cf8ca94ccefab209938c948e950379f0e3077 SHA256 31e844ae189d45b861166f42800a301b0495cec3a03bf4617bc14d2b35c04da3 MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk36ujYACgkQVWmRsqeSphPdfwCfVNILqSWp2vh3C6BgwW9YulN2 -P9UAnj7J9F16KbCo2+jAqXqUjCQu6Lg2 -=DZ/N +iQIcBAEBCgAGBQJN/QPNAAoJENwGBM22xffeNvoP+gOvs8hK6aLISkAPRhZCqnla +a4BduIeiFzlQgB8FJrcbtSCAaDBFjmPQbGQ+tQJBCA3QXb43c/2wTdlCAkcivGdD +aohZdOE41fywhBm35+UNE87apCMW8D3ogR+UmNtwuzHZNej3TxQ1YNHmOqSUEe44 +urCLjlkf+209M+sczaVKsdK8V8Px9ng4s06OTJ3F1Ucko6nGFjs0I4PLmV1+xZzI +R9mDcGQg0NKUQcUpexO9sUun4WPaMelXxBP2kjVmPMm3l7brVlH4BhI8k/wuO2lR +h28cKs6xoSeubAQiKTCEgoVkNo2cpfC0n5CnmRe/jrwwITO0W+OZBNs5Uf574JKS +tywmpve5GDAm5Ifv3/XPicnJrjjQPjs0Fagw8naILhMREEwuEnBB/q00BZzJSMpn +Dir0Ya70E3s3cUET0NN6OXFDPihbxhma3Ey9WJql6ipLIXs04sgMU5c3bxPB4aKf +Mp7GQJKyTSWeK7TnEEmwpNLuxniqIACTBdzq+SzC7vpr8a6Wc63rIjYsmYl5hR3O +I4NjTuqnwejD3Grcuc4LLlG9bGFvIqh3zp2wDOzFOaI7dPfGlEeLqfn00VkWnZek +XYD2QLUMGhHKr1xSgDn1jEKOGAQjwv1LTfEBZU6HANpLzIO1bMe8fELmP5jeUv1E +uQ3e3NpGkraToa6L1uFg +=SrrU -----END PGP SIGNATURE----- diff --git a/net-print/cups/cups-1.5_rc1.ebuild b/net-print/cups/cups-1.5_rc1.ebuild new file mode 100644 index 000000000000..75fad83c92f3 --- /dev/null +++ b/net-print/cups/cups-1.5_rc1.ebuild @@ -0,0 +1,296 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5_rc1.ebuild,v 1.1 2011/06/18 19:59:55 dilfridge Exp $ + +# +# See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD +# for some notes about the ongoing work here +# + +EAPI=3 + +PYTHON_DEPEND="python? 2:2.5" + +inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 + +MY_P=${P/_} +MY_PV=${PV/_} + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="http://www.cups.org/" +SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba 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 + IUSE="${IUSE} linguas_${X}" +done + +RDEPEND=" + app-text/libpaper + acl? ( + kernel_linux? ( + sys-apps/acl + sys-apps/attr + ) + ) + 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 ) + php? ( dev-lang/php ) + png? ( >=media-libs/libpng-1.4.3 ) + slp? ( >=net-libs/openslp-1.0.4 ) + ssl? ( + gnutls? ( + dev-libs/libgcrypt + >=net-libs/gnutls-2.11 + ) + !gnutls? ( >=dev-libs/openssl-0.9.8g ) + ) + tiff? ( >=media-libs/tiff-3.5.5 ) + usb? ( virtual/libusb:0 ) + X? ( x11-misc/xdg-utils ) + xinetd? ( sys-apps/xinetd ) + !net-print/cupsddk +" + +DEPEND="${RDEPEND} + dev-util/pkgconfig +" + +PDEPEND=" + app-text/ghostscript-gpl[cups] + >=app-text/poppler-0.12.3-r3[utils] +" + +# upstream includes an interactive test which is a nono for gentoo. +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup lp + enewuser lp -1 -1 -1 lp + enewgroup lpadmin 106 + + # python 3 is no-go + if use python; then + python_set_active_version 2 + python_pkg_setup + fi + + if use usb; then + elog "You are going to use new libusb backed to access your usb printer." + elog "This interface has quite few known issues and does not report all" + elog "issues and just refuses to print." + elog "Please consider disabling usb useflag if you are having issues." + elog + elog "Please note that if you disable the usb useflag your device will be" + elog "still working using kernel usblp interface instead of libusb." + echo + fi + + linux-info_pkg_setup + if ! linux_config_exists; then + ewarn "Can't check the linux kernel configuration." + ewarn "You might have some incompatible options enabled." + else + # recheck that we don't have usblp to collide with libusb + if use usb; then + if linux_chkconfig_present USB_PRINTER; then + eerror "Your usb printers will be managed via libusb which collides with kernel module." + eerror "${P} requires the USB_PRINTER support disabled." + eerror "Please disable it:" + eerror " CONFIG_USB_PRINTER=n" + eerror "in /usr/src/linux/.config or" + eerror " Device Drivers --->" + eerror " USB support --->" + eerror " [ ] USB Printer support" + eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." + die "USB_PRINTER module enabled" + fi + else + #here we should warn user that he should enable it so he can print + if ! linux_chkconfig_present USB_PRINTER; then + ewarn "If you plan to use USB printers you should enable the USB_PRINTER" + ewarn "support in your kernel." + ewarn "Please enable it:" + ewarn " CONFIG_USB_PRINTER=y" + ewarn "in /usr/src/linux/.config or" + ewarn " Device Drivers --->" + ewarn " USB support --->" + ewarn " [*] USB Printer support" + ewarn "Alternatively, enable the usb useflag for cups and use the new, less-tested libusb code." + fi + fi + fi +} + +src_prepare() { + # various build time fixes + epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" + epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch" + epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" + epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" + + AT_M4DIR=config-scripts eaclocal + eautoconf +} + +src_configure() { + export DSOFLAGS="${LDFLAGS}" + + # locale support + strip-linguas ${LANGS} + if [ -z "${LINGUAS}" ] ; then + export LINGUAS=none + fi + + local myconf + if use ssl || use gnutls ; then + myconf+=" + $(use_enable gnutls) + $(use_enable !gnutls openssl) + " + else + myconf+=" + --disable-gnutls + --disable-openssl + " + fi + + # bug 352252, recheck for later versions if still necessary.... + if use gnutls && ! use threads ; then + ewarn "The useflag gnutls requires also threads enabled. Switching on threads." + fi + if use gnutls || use threads ; then + myconf+=" --enable-threads " + else + myconf+=" --disable-threads " + fi + + econf \ + --libdir=/usr/$(get_libdir) \ + --localstatedir=/var \ + --with-cups-user=lp \ + --with-cups-group=lp \ + --with-docdir=/usr/share/cups/html \ + --with-languages="${LINGUAS}" \ + --with-pdftops=/usr/bin/pdftops \ + --with-system-groups=lpadmin \ + $(use_enable acl) \ + $(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 tiff) \ + $(use_enable usb libusb) \ + $(use_with java) \ + $(use_with perl) \ + $(use_with php) \ + $(use_with python) \ + $(use_with xinetd xinetd /etc/xinetd.d) \ + --enable-libpaper \ + --disable-dnssd \ + ${myconf} + + # install in /usr/libexec always, instead of using /usr/lib/cups, as that + # makes more sense when facing multilib support. + sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die + sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die + sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die +} + +src_compile() { + emake || die "emake failed" + + if use perl ; then + cd "${S}"/scripting/perl + perl-module_src_prep + perl-module_src_compile + fi + + if use php ; then + cd "${S}"/scripting/php + emake || die "emake php failed" + fi +} + +src_install() { + emake BUILDROOT="${D}" install || die "emake install failed" + dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed" + + if use perl ; then + cd "${S}"/scripting/perl + perl-module_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} + + # install our init script + local neededservices + use dbus && neededservices+=" dbus" + [[ -n ${neededservices} ]] && neededservices="need${neededservices}" + cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die + sed -i \ + -e "s/@neededservices@/$neededservices/" \ + "${T}"/cupsd || die + doinitd "${T}"/cupsd || die "doinitd failed" + + # install our pam script + pamd_mimic_system cups auth account + + if use xinetd ; then + # correct path + sed -i \ + -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ + "${D}"/etc/xinetd.d/cups-lpd || die + # it is safer to disable this by default, bug #137130 + grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \ + { sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; } + # write permission for file owner (root), bug #296221 + fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + else + rm -rf "${D}"/etc/xinetd.d + fi + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ + /var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \ + /var/spool/cups/tmp + + keepdir /etc/cups/{interfaces,ppd,ssl} + + use X || rm -r "${D}"/usr/share/applications + + # create /etc/cups/client.conf, bug #196967 and #266678 + echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf +} + +pkg_postinst() { + echo + elog "For information about installing a printer and general cups setup" + elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" + echo +} |