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 B0CC9138331 for ; Thu, 29 Mar 2018 08:31:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB56AE086B; Thu, 29 Mar 2018 08:31:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 80358E086B for ; Thu, 29 Mar 2018 08:31:47 +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 21DE1335D01 for ; Thu, 29 Mar 2018 08:31:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2261D26A for ; Thu, 29 Mar 2018 08:31:44 +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: <1522312297.f8137beb67c5bda825450b47df07e24df1ef2ed8.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/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: f8137beb67c5bda825450b47df07e24df1ef2ed8 X-VCS-Branch: master Date: Thu, 29 Mar 2018 08:31:44 +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: 9f06ed79-f777-4c28-a7ec-daf76d60bd50 X-Archives-Hash: 2bcf6272ae72a158bbac72e60f6b1e52 commit: f8137beb67c5bda825450b47df07e24df1ef2ed8 Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 29 08:31:20 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 29 08:31:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8137beb net-print/cups: Synced live ebuild. Package-Manager: Portage-2.3.26, Repoman-2.3.7 net-print/cups/cups-9999.ebuild | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 873f91da5e3..b971a2a2cdc 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -9,10 +9,9 @@ inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \ multilib multilib-minimal pam python-single-r1 user versionator \ java-pkg-opt-2 systemd toolchain-funcs -MY_P=${P/_rc/rc} -MY_P=${MY_P/_beta/b} -MY_PV=${PV/_rc/rc} -MY_PV=${MY_PV/_beta/b} +MY_PV="${PV/_rc/rc}" +MY_PV="${MY_PV/_beta/b}" +MY_P="${PN}-${MY_PV}" if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -22,14 +21,16 @@ if [[ ${PV} == *9999 ]]; then fi else #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" + SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" + fi fi DESCRIPTION="The Common Unix Printing System" HOMEPAGE="https://www.cups.org/" -LICENSE="GPL-2" +LICENSE="Apache-2.0" SLOT="0" IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" @@ -90,6 +91,8 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/cups-config ) +S="${WORKDIR}/${MY_P}" + pkg_setup() { enewgroup lp enewuser lp -1 -1 -1 lp