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 2BBE3139085 for ; Thu, 29 Dec 2016 18:52:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 720CDE0C06; Thu, 29 Dec 2016 18:52:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44171E0C06 for ; Thu, 29 Dec 2016 18:52:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79E13341668 for ; Thu, 29 Dec 2016 18:52:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FF2F24E8 for ; Thu, 29 Dec 2016 18:52:15 +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: <1483037531.29f8e078fb4f0d6f1fce9943bd2d425a093b7702.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: 29f8e078fb4f0d6f1fce9943bd2d425a093b7702 X-VCS-Branch: master Date: Thu, 29 Dec 2016 18:52:15 +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: a7181fab-cd15-4c5d-9cda-5130af93f0b2 X-Archives-Hash: 907d5a0829373129f6af2d4f8fd6fd57 commit: 29f8e078fb4f0d6f1fce9943bd2d425a093b7702 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 29 18:51:55 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 29 18:52:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f8e078 net-print/cups: Synced live ebuild with latest release ebuild. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-print/cups/cups-9999.ebuild | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index b08ffec..d795683 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) @@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_BRANCH=branch-${PV/.9999} fi else - SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2" + SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" fi @@ -86,15 +86,12 @@ REQUIRED_USE=" # upstream includes an interactive test which is a nono for gentoo RESTRICT="test" -S="${WORKDIR}/${MY_P}" - # systemd-socket.patch from Fedora PATCHES=( - "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" + "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" - "${FILESDIR}/${PN}-2.1.2-systemd-socket.patch" "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" "${FILESDIR}/${PN}-2.0.3-cross-compile.patch" ) @@ -148,9 +145,7 @@ pkg_setup() { } src_prepare() { - epatch ${PATCHES[@]} - - epatch_user + default # Remove ".SILENT" rule for verbose output (bug 524338). sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed" @@ -260,7 +255,7 @@ multilib_src_install_all() { use zeroconf && neededservices+=" avahi-daemon" use dbus && neededservices+=" dbus" [[ -n ${neededservices} ]] && neededservices="need${neededservices}" - cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die + cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die sed -i \ -e "s/@neededservices@/$neededservices/" \ "${T}"/cupsd || die @@ -288,7 +283,7 @@ multilib_src_install_all() { keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ /var/log/cups /var/spool/cups/tmp - keepdir /etc/cups/{ppd,ssl} + keepdir /etc/cups/{interfaces,ppd,ssl} use X || rm -r "${ED}"/usr/share/applications