From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-913797-garchives=archives.gentoo.org@lists.gentoo.org>
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 BF70D1395E2
for <garchives@archives.gentoo.org>; Sun, 27 Nov 2016 21:33:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 72DB6E0B71;
Sun, 27 Nov 2016 21:33:16 +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 5BFCCE0B71
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2016 21:33:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 22235341375
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2016 21:33:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D671C49E
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2016 21:33:12 +0000 (UTC)
From: "Kristian Fiskerstrand" <k_f@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" <k_f@gentoo.org>
Message-ID: <1480282381.28d17d57a580ffbc0ae0443908b4b51ed15e2d41.k_f@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/xapps/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-libs/xapps/xapps-1.0.2-r1.ebuild x11-libs/xapps/xapps-1.0.2.ebuild
X-VCS-Directories: x11-libs/xapps/
X-VCS-Committer: k_f
X-VCS-Committer-Name: Kristian Fiskerstrand
X-VCS-Revision: 28d17d57a580ffbc0ae0443908b4b51ed15e2d41
X-VCS-Branch: master
Date: Sun, 27 Nov 2016 21:33:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: bd25a712-af9d-4f7a-b1c7-37a80f2c35f1
X-Archives-Hash: a59a024494a7213524bb6ab5cf6e699b
commit: 28d17d57a580ffbc0ae0443908b4b51ed15e2d41
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:30:21 2016 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:33:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d17d57
x11-libs/xapps: Fixes to previous addition
Package-Manager: portage-2.3.2
.../{xapps-1.0.2.ebuild => xapps-1.0.2-r1.ebuild} | 46 ++++++++++++++++------
1 file changed, 33 insertions(+), 13 deletions(-)
diff --git a/x11-libs/xapps/xapps-1.0.2.ebuild b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
similarity index 56%
rename from x11-libs/xapps/xapps-1.0.2.ebuild
rename to x11-libs/xapps/xapps-1.0.2-r1.ebuild
index b9d1b33..7bc074f 100644
--- a/x11-libs/xapps/xapps-1.0.2.ebuild
+++ b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
@@ -2,35 +2,55 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit autotools
-
-SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+inherit autotools gnome2-utils
DESCRIPTION="Cross-desktop libraries and common resources"
HOMEPAGE="https://github.com/linuxmint/xapps/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-3"
SLOT="0"
+IUSE="static-libs"
RDEPEND="
- >=x11-libs/gdk-pixbuf-2.22.0:2[introspection]
- >=x11-libs/gtk+-3.3.16:3[introspection]
>=dev-libs/glib-2.37.3:2
- x11-libs/cairo
gnome-base/libgnomekbd
gnome-base/gnome-common
+ dev-libs/gobject-introspection:0=
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.22.0:2[introspection]
+ >=x11-libs/gtk+-3.3.16:3[introspection]
+ x11-libs/libxkbfile
"
-DEPEND="${RDEPEND}"
-src_prepare(){
+DEPEND="${RDEPEND}
+ "
+
+src_prepare() {
+ eapply_user
eautoreconf
- default
}
-src_install(){
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable introspection)
+}
+
+src_install() {
default
rm -rf "${D}/usr/bin/" || die
+ [ use static-libs ] || rm -rf "${D}/usr/lib64/libxapp.la" || die
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
}