From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D3A6B138335 for ; Wed, 6 Jun 2018 09:09:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83304E0ADF; Wed, 6 Jun 2018 09:09:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E889E0ADF for ; Wed, 6 Jun 2018 09:09:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79039335C84 for ; Wed, 6 Jun 2018 09:09:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F8402C6 for ; Wed, 6 Jun 2018 09:09:41 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1528276175.894ed7fbb5da9364cdfdca5ab3bfc9b2b7123b11.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/Manifest net-print/cups/cups-2.3_beta4.ebuild net-print/cups/cups-2.3_beta5.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 894ed7fbb5da9364cdfdca5ab3bfc9b2b7123b11 X-VCS-Branch: master Date: Wed, 6 Jun 2018 09:09:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0063e9d-1cd7-4a10-a8a8-1fb820d09727 X-Archives-Hash: 1f541be722f98775012613ac91c5c5b0 commit: 894ed7fbb5da9364cdfdca5ab3bfc9b2b7123b11 Author: Lars Wendler gentoo org> AuthorDate: Wed Jun 6 08:56:04 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jun 6 09:09:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894ed7fb net-print/cups: Bump to version 2.3_beta5. Removed old. Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-print/cups/Manifest | 2 +- .../{cups-2.3_beta4.ebuild => cups-2.3_beta5.ebuild} | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index a7c72a3f673..3d97bd7f229 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -2,4 +2,4 @@ DIST cups-2.1.4.tar.gz 9572653 BLAKE2B d01242e8188f8b179e2beebc3730cc32588c4512e DIST cups-2.2.6.tar.gz 10317889 BLAKE2B 5d9d8a09e73074a8638913c30e163cbed6bbadc4fa0c6b24dd185a2137f3af72aba553b3de62dbf053f9f92f7737efdb5d06e27bfb84225f39d855d830aea02e SHA512 ae880aa3f675e0c1ad269200d06be3c25675a45a697c7a8b44e6ec0c30f05f333acca35cd965e667ff066d753df5e59447c2eeaea240e72d2731690b3b9dcf76 DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e DIST cups-2.2.8-source.tar.gz 10374921 BLAKE2B 3fc4d5cae3848cbb7fb1263b377210254dfa08d70a1218c7f20d5a277d0536791e071c50bac282ab2049e1cffddfe91438216ceb37ec279d7cb0ec7b57a315da SHA512 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261 -DIST cups-2.3b4-source.tar.gz 10130356 BLAKE2B 10dd250516bafa1df0e8d123fbfff44f290180771d5d9bca0879ca985435299277d42e2222969cb1d6f9b5e55ad86f3dd7ebd246724edcb257b42ddb3d7e91b4 SHA512 5613b18bfc28c53fb738feb3e0a96ec6b4cec8575479f50dc06f835e109de52af6f5d0c247c84b9b22285e92ea9694839269c27b67c641cc5f81a68a1f818b31 +DIST cups-2.3b5-source.tar.gz 10176856 BLAKE2B beda07a64ef463371e4e1f25b397caa9487f7acdc982fcfa7edee736a41f6a6875747c772e4c59e2d2746c8c508a0cc87f8608227592f5e1d9c8c48d956ab97c SHA512 48d45f090637bf32bdcc83106272efb8462ff609f74fbe4e82add7f851dcb9173126a1df186848c087d02e8c1441f31a70859faf2714b6ddb1f3738ef8dba60d diff --git a/net-print/cups/cups-2.3_beta4.ebuild b/net-print/cups/cups-2.3_beta5.ebuild similarity index 94% rename from net-print/cups/cups-2.3_beta4.ebuild rename to net-print/cups/cups-2.3_beta5.ebuild index 5a4700f5087..608055933fa 100644 --- a/net-print/cups/cups-2.3_beta4.ebuild +++ b/net-print/cups/cups-2.3_beta5.ebuild @@ -5,9 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \ - multilib multilib-minimal pam python-single-r1 user versionator \ - systemd toolchain-funcs +inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam user systemd toolchain-funcs MY_PV="${PV/_rc/rc}" MY_PV="${MY_PV/_beta/b}" @@ -32,7 +30,7 @@ HOMEPAGE="https://www.cups.org/" LICENSE="Apache-2.0" SLOT="0" -IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" +IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" CDEPEND=" app-text/libpaper @@ -47,10 +45,7 @@ CDEPEND=" kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) - python? ( ${PYTHON_DEPS} ) - ssl? ( - >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] - ) + ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) @@ -69,7 +64,6 @@ RDEPEND="${CDEPEND} PDEPEND=">=net-print/cups-filters-1.0.43" REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) usb? ( threads ) " @@ -96,8 +90,6 @@ pkg_setup() { enewuser lp -1 -1 -1 lp enewgroup lpadmin 106 - use python && python-single-r1_pkg_setup - if use kernel_linux; then linux-info_pkg_setup if ! linux_config_exists; then @@ -176,7 +168,6 @@ multilib_src_configure() { $(use_enable debug debug-printfs) $(use_enable kerberos gssapi) $(multilib_native_use_enable pam) - $(multilib_native_use_with python python "${PYTHON}") $(use_enable static-libs static) $(use_enable threads) $(use_enable ssl gnutls) @@ -314,7 +305,7 @@ pkg_postinst() { local v for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.2.2-r2 ${v}; then + if ! ver_test ${v} -ge 2.2.2-r2 ; then echo ewarn "The cupsd init script switched to using pidfiles. Shutting down" ewarn "cupsd will fail the next time. To fix this, please run once as root"