From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QMeF4-0001Aa-3w for garchives@archives.gentoo.org; Wed, 18 May 2011 10:44:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D1E71C128; Wed, 18 May 2011 10:44:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 07CA01C128 for ; Wed, 18 May 2011 10:44:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65AE31B403D for ; Wed, 18 May 2011 10:44:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E0CD654EBD for ; Wed, 18 May 2011 10:44:29 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <39575d8efca13bf7139301e060b79002e6377cd8.scarabeus@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/oxygen-icons/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild kde-base/oxygen-icons/oxygen-icons-9999.ebuild X-VCS-Directories: kde-base/oxygen-icons/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 39575d8efca13bf7139301e060b79002e6377cd8 Date: Wed, 18 May 2011 10:44:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 48335adbf9b1f0f47c6a07c7b88330cd commit: 39575d8efca13bf7139301e060b79002e6377cd8 Author: Tomas Chvatal gentoo org> AuthorDate: Wed May 18 10:44:23 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Wed May 18 10:44:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D39575d8e [kde-base/oxygen-icons] sync with release ebuild. --- kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild | 24 ++++++++++++++= +++-- kde-base/oxygen-icons/oxygen-icons-9999.ebuild | 24 ++++++++++++++= +++-- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild b/kde-bas= e/oxygen-icons/oxygen-icons-4.6.9999.ebuild index 4851d08..7d171d4 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.6.9999.ebuild @@ -4,19 +4,37 @@ =20 EAPI=3D4 =20 -if [[ ${PV} =3D *9999 ]]; then +if [[ ${PV} =3D=3D *9999 ]]; then KMNAME=3D"kdesupport" +else + # Upstream does not ship releases properly so we dont want all versions + MY_PV=3D"4.6.2" + MY_P=3D"${PN}-${MY_PV}" fi KDE_REQUIRED=3D"never" inherit kde4-base =20 DESCRIPTION=3D"Oxygen SVG icon theme." HOMEPAGE=3D"http://www.oxygen-icons.org/" -#SRC_URI=3D"mirror://kde/unstable/${PV}/src/${P}.tar.bz2" +# Note that the upstream tarball is .bz2, ours is .xz -- if upstream +# changes its compression format to .xz, we will need to change the +# filename of one of the tarballs +[[ ${PV} =3D=3D *9999 ]] || \ +SRC_URI=3D" + !bindist? ( http://dev.gentoo.org/~scarabeus/${MY_P}.tar.xz ) + bindist? ( ${SRC_URI//${PV}/${MY_PV}} ) +" =20 LICENSE=3D"LGPL-3" KEYWORDS=3D"" -IUSE=3D"aqua" +IUSE=3D"aqua bindist" + +DEPEND=3D" + !bindist? ( app-arch/xz-utils ) +" +RDEPEND=3D"" + +[[ ${PV} =3D=3D *9999 ]] || S=3D${WORKDIR}/${MY_P} =20 # Block conflicting packages add_blocker kdebase-data '<4.2.67' diff --git a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild b/kde-base/ox= ygen-icons/oxygen-icons-9999.ebuild index 4851d08..7d171d4 100644 --- a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild @@ -4,19 +4,37 @@ =20 EAPI=3D4 =20 -if [[ ${PV} =3D *9999 ]]; then +if [[ ${PV} =3D=3D *9999 ]]; then KMNAME=3D"kdesupport" +else + # Upstream does not ship releases properly so we dont want all versions + MY_PV=3D"4.6.2" + MY_P=3D"${PN}-${MY_PV}" fi KDE_REQUIRED=3D"never" inherit kde4-base =20 DESCRIPTION=3D"Oxygen SVG icon theme." HOMEPAGE=3D"http://www.oxygen-icons.org/" -#SRC_URI=3D"mirror://kde/unstable/${PV}/src/${P}.tar.bz2" +# Note that the upstream tarball is .bz2, ours is .xz -- if upstream +# changes its compression format to .xz, we will need to change the +# filename of one of the tarballs +[[ ${PV} =3D=3D *9999 ]] || \ +SRC_URI=3D" + !bindist? ( http://dev.gentoo.org/~scarabeus/${MY_P}.tar.xz ) + bindist? ( ${SRC_URI//${PV}/${MY_PV}} ) +" =20 LICENSE=3D"LGPL-3" KEYWORDS=3D"" -IUSE=3D"aqua" +IUSE=3D"aqua bindist" + +DEPEND=3D" + !bindist? ( app-arch/xz-utils ) +" +RDEPEND=3D"" + +[[ ${PV} =3D=3D *9999 ]] || S=3D${WORKDIR}/${MY_P} =20 # Block conflicting packages add_blocker kdebase-data '<4.2.67'