diff options
| -rw-r--r-- | net-print/cups/ChangeLog | 9 | ||||
| -rw-r--r-- | net-print/cups/Manifest | 36 | ||||
| -rw-r--r-- | net-print/cups/cups-1.7.2.ebuild | 14 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 14 |
4 files changed, 46 insertions, 27 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index ed9ce871a56c..1ca0ad5c9e10 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-print/cups # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.599 2014/04/15 11:34:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.600 2014/04/15 21:05:29 dilfridge Exp $ + + 15 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.7.2.ebuild, + cups-9999.ebuild: + systemd support was added to net-print/cups with the understanding that the + systemd team takes care of relevant bugs as long as the patches are not + upstreamed. Unfortunately noone of them cares, which is why we will only + conditionally apply the patch now. See bug 450282, bug 494582, bug 500300. *cups-1.7.2 (15 Apr 2014) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index c96d145738c4..1baf6aa7c1fe 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -10,26 +10,26 @@ AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486 DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04 DIST cups-1.7.2-source.tar.bz2 8754601 SHA256 315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676 SHA512 441256bdfbe4a720244143d229f12e0a3e2e27e6298baee3ddca9f7f6bd3e3c2818136c90a110bebbbf9b034a48f8bd1af06788c25258e61aa3bc524e492a912 WHIRLPOOL b3c977275a89c6c8b2773bddf615168bcc6f2379bf49f991e0141eb5db482035e0e611d22d6c99351dc1e41e003470322dedabcc37244289c237671bae5f792c EBUILD cups-1.7.1.ebuild 9236 SHA256 aa03e3d61ee332799dace86f969c82ba68a76ec9aff2f39d7b67c198f1e21b94 SHA512 e9fbe6287cac20d06b4278e99013fba7bf15f1e7f23f037115373f4193320faf5fe96e86338bb181a9f084606c757f30a711754bc3df746bb27f07fb79a0aa15 WHIRLPOOL 46353815cc0df8ffcd0d9eb1b0026ee0db234bb74f81d5195caebbd8241004a768b154e38e09d918a75c7875f1e69756165c2cf6218e4a7b59d19941385cad54 -EBUILD cups-1.7.2.ebuild 9261 SHA256 21a9761756d2c5f236804d7df01e185bd0cbd33c9559d6defb3d222965c263de SHA512 22bfd4748e60579c257e72ab4799317b8cc8026ab1e3312d69cbceab5897a915cb5ab5d20e59adcacc49a8c569ab0aafb866949eab0588df500ba14d22efc449 WHIRLPOOL 65b4b675912f87981d106cb6dffa664be3471972f451ac633b70dbf4d4e0c15295e2c099c3a9b5b732e7cecfbbd2ee62faabb56a43c24f755a12f770c1d69c4c -EBUILD cups-9999.ebuild 9244 SHA256 8e325354ed31558c3437922927e0b41b8e4c3ed8eb9015a8cc937eecbfcbc868 SHA512 f724cd56a6d4e640f637ce3c605303ed103ca3c241ee80b30844b289c99fa6ce44ece9196531743207160ca27be1edcbd69b9f5aec18c0d35c2215f3394d96be WHIRLPOOL 7365351bbe91444b35218f3c056f804c542e882805f2c2686d0dd50edc8dbdb8f965c04d3739404bec1cc92ede360191f3363a4336295553c22715226a179d70 -MISC ChangeLog 90739 SHA256 34cad5e634ef8066d99c284074bc1db3856b8a3e75e0f02709e339d0be3d4bfa SHA512 84b403a83a0438ba84bc8b7b39406c82047c544478fe7bc9f7724baa38860cf1896dfd3a6828b9d0e49508bdeea94b229eb58d3473be6a68221eb2df8b951043 WHIRLPOOL 475d1696bae69e51b77d3304d95977ef35b1008734bca1a657fa4ea6699ce3b4b8f60322593f947ec5c4269e1fab4b4d92fa0fed57d9d7e16e21721bc0c07fbb +EBUILD cups-1.7.2.ebuild 9317 SHA256 ab7ddd09a89ac9acc0774e603289b85caf1ba1088b221585a26ae39d5dabaeef SHA512 7776c1fcfc17d7ffe87f6d137fe26f45af68b192799d0c49386dff6c854ae470f6b9f9bf2b27b5e3e8dff450e4fc0487b83b2b950ce8bfd839a1b999bb6ce088 WHIRLPOOL 891a9988dd5f1be6bb9b3886e685c9b122eb553625d91fabf898cfa2aefb50a9d51cae0bf49f1bf5980964f94d1facd69abb043aae91e9dd2e2065cfaf91dbc9 +EBUILD cups-9999.ebuild 9303 SHA256 7f49a77d5689cf50891a9c74b4d0c9ffcdc1125f99e453a48590b50af96e59d3 SHA512 73ef8e4d4db293233c8b1a114856f2cb8c518a4672662a5706d91b0417bfeab923fe74e57cbe6aab9fb3a4a9d52f91d988663c72e72f482ae7de24bf5e2174c4 WHIRLPOOL 568391cdd7e62775cfdd08e4e12afa1a8e6dd4234786539e3007577cddc9209b1cfa6e87ddb3ee645ff067e3d4187baacbf3e3eaea85efa55313b65c18b206b5 +MISC ChangeLog 91140 SHA256 cfb45487d9f2cd2f464214b323be65406600b9dc827be53f7329c3b662811ef2 SHA512 76af33a020d4983701d166e87bcdd7ad7a0c6e929610be872d1b8c6ed43608fe2f0e6e6dc71dff92f97ae4b63d235e941020896941f98f8eb2a1dfc7977cbc4e WHIRLPOOL 867a170049c87793a60986e1cc157f44549cfa6c35d5db87a387c7ce0cb3c9b66125a47f421e49cc85ce27ba0026bb7d09cdc579963a6e58f9c0662168eab2ed MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTTRkwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5 -NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvs40P/RyKlBKKiKt3JyCJmtuoG8rc -hftzP2YkqT7aG2jGEm7vvsZ2wSMQC/+3MsEt5Igd33ZLWynNbAEqj0OYk7Uxg+Ks -J+coVoU4q230dgJbhErt+9t5O516Z74wNn9rW/tktMWHHjmG3apufyyOIe0M1lBI -E7kKCOozTHarjk/ZxflRWGcmyb2vpqor8R/FIs/GwasYqrqBPMWiWBicYXRbsuQU -ewMM63j+UNYZy8IWWQXIdNMrcmYNE3acQ5zufjPjkaOyDH6h/GIA6en0HcSs0H/6 -Wa3HcTXc45P6bQp8qiX+BNFLf2Y9LENkABbvWEIWUDXfYrVlfzDAM5gxIzWQt0wn -uRzhz14xjNT6jNV4s/ORznv6af0QJGAC9dvKHtns/eRb0JW1x+eZwlf3jIaQSqwW -FprnH9CaCA0tEziralWVLaaXu4BeZA8/gfoASPMJm6ZCNFHYgJNsHWYDCsiXy7nD -fTEbnInmrDpJxyBaHNwQwvvZhnfzlRzJ31QXju/cm9o8BYoIlle8qiFKZG2mTWCV -1QXqim+kEZam0AgvwkGsXMIS2xYeNJdhQZYIQNYccEThbh+obZsi6KrvI5VPMXoB -pSDif9i8eiqh8qYbSTb6qYgLcb2t8NBF1wpGKxtUluflYaOVHoS38mH/z37Tgie2 -UMDPa6sUnUvcZ3kki9aM -=4NXo +iQJ8BAEBCABmBQJTTZ8aXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc2xMQAMJjLR82EJAEk5BZXg1Dg8HY +P5FExMMVvsPpRi4it0FHTTFlAbIHZTgZj3+4zjfTr4d2/ZldMISPEBV2FH1cTZHZ +5Nd4k9qBua9B1FCGXwz5Wy1orefq3WL3OMoOGmMeDMjT3HGnAE5i92yOxua1HXi4 +caeVyEFdt4kANrRu79PAlP5QMWPbmRvXM8gltzNBXvE2hUesp7/WPPOt9sRnHqBK +8PAm5fUXDYksDg+7WmVF6dks+glX0fDr6YFSJfP/LF1aXD7U3T/oG7KBNb6UEjRU +nqSR4VYRaWOgtwNMBygkypQCk8U0DYARiLOwHYFq4WrIgj8i/fVsT8Bd8d5Tp14B +l6w1ZrEa0XQCfcmUDYdAbfiwH+zQOOJwGqg8gNJTKdW6gkHsJW8i1/ljVOAaW0Sg +bXqIM5zN85W+uLUzeKNiPGtNc9+spvmEMdvRJ39hZAz6HCOiixA+na80IsTva3nc +K1ToBhFXyyGoSkUMbrS+EhwMjXNinciNCn/NHQun1GygZYpvTHMtFRQeHCXrtpQd +40OjQZuV26cgyd0Osj3iTaF4h6+MDiJHKmpy4WfIQ0P5Wc2elhJK4uGOQfJIRfm1 +RKp1u0vl+rN/5zvPOC19OmBoYisvaJOyZEXxR10B6Had8lTvldWER2LPLyOf7fRq +tXzwlPumgBp2SuFn96kz +=/5oC -----END PGP SIGNATURE----- diff --git a/net-print/cups/cups-1.7.2.ebuild b/net-print/cups/cups-1.7.2.ebuild index 36c530dfb3ac..5ae3ac3fe1dc 100644 --- a/net-print/cups/cups-1.7.2.ebuild +++ b/net-print/cups/cups-1.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2.ebuild,v 1.1 2014/04/15 11:34:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2.ebuild,v 1.2 2014/04/15 21:05:29 dilfridge Exp $ EAPI=5 @@ -34,7 +34,7 @@ HOMEPAGE="http://www.cups.org/" LICENSE="GPL-2" SLOT="0" IUSE="acl dbus debug gnutls java kerberos lprng-compat pam - python selinux +ssl static-libs +threads usb X xinetd zeroconf" + python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" LANGS="ca es fr it ja ru" for X in ${LANGS} ; do @@ -94,7 +94,6 @@ PATCHES=( "${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.7.2-systemd-socket-2.patch" # systemd support ) pkg_setup() { @@ -143,6 +142,8 @@ pkg_setup() { src_prepare() { base_src_prepare + use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch" + AT_M4DIR=config-scripts eaclocal eautoconf } @@ -172,6 +173,12 @@ src_configure() { " fi + if use systemd; then + myconf+=" + --with-systemdsystemunitdir="$(systemd_get_unitdir)" + " + fi + econf \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --localstatedir="${EPREFIX}"/var \ @@ -198,7 +205,6 @@ src_configure() { $(use_with python python "${PYTHON}") \ $(use_with xinetd xinetd /etc/xinetd.d) \ --enable-libpaper \ - --with-systemdsystemunitdir="$(systemd_get_unitdir)" \ ${myconf} # install in /usr/libexec always, instead of using /usr/lib/cups, as that diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index c103561866fe..7330a68609d5 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.52 2014/03/01 22:33:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.53 2014/04/15 21:05:29 dilfridge Exp $ EAPI=5 @@ -33,7 +33,7 @@ HOMEPAGE="http://www.cups.org/" LICENSE="GPL-2" SLOT="0" IUSE="acl dbus debug gnutls java kerberos lprng-compat pam - python selinux +ssl static-libs +threads usb X xinetd zeroconf" + python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" LANGS="ca es fr it ja ru" for X in ${LANGS} ; do @@ -93,7 +93,6 @@ PATCHES=( "${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.5.0-systemd-socket-2.patch" # systemd support ) pkg_setup() { @@ -142,6 +141,8 @@ pkg_setup() { src_prepare() { base_src_prepare + use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch" + AT_M4DIR=config-scripts eaclocal eautoconf } @@ -171,6 +172,12 @@ src_configure() { " fi + if use systemd; then + myconf+=" + --with-systemdsystemunitdir="$(systemd_get_unitdir)" + " + fi + econf \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --localstatedir="${EPREFIX}"/var \ @@ -197,7 +204,6 @@ src_configure() { $(use_with python python "${PYTHON}") \ $(use_with xinetd xinetd /etc/xinetd.d) \ --enable-libpaper \ - --with-systemdsystemunitdir="$(systemd_get_unitdir)" \ ${myconf} # install in /usr/libexec always, instead of using /usr/lib/cups, as that |