From 28d17d57a580ffbc0ae0443908b4b51ed15e2d41 Mon Sep 17 00:00:00 2001
From: Kristian Fiskerstrand <k_f@gentoo.org>
Date: Sun, 27 Nov 2016 22:30:21 +0100
Subject: x11-libs/xapps: Fixes to previous addition

Package-Manager: portage-2.3.2
---
 x11-libs/xapps/xapps-1.0.2-r1.ebuild | 56 ++++++++++++++++++++++++++++++++++++
 x11-libs/xapps/xapps-1.0.2.ebuild    | 36 -----------------------
 2 files changed, 56 insertions(+), 36 deletions(-)
 create mode 100644 x11-libs/xapps/xapps-1.0.2-r1.ebuild
 delete mode 100644 x11-libs/xapps/xapps-1.0.2.ebuild

(limited to 'x11-libs')

diff --git a/x11-libs/xapps/xapps-1.0.2-r1.ebuild b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
new file mode 100644
index 00000000000..7bc074f1e0d
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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"
+
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	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() {
+	eapply_user
+	eautoreconf
+}
+
+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
+}
diff --git a/x11-libs/xapps/xapps-1.0.2.ebuild b/x11-libs/xapps/xapps-1.0.2.ebuild
deleted file mode 100644
index b9d1b3335e6..00000000000
--- a/x11-libs/xapps/xapps-1.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools
-
-SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapps/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-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
-"
-DEPEND="${RDEPEND}"
-
-src_prepare(){
-	eautoreconf
-	default
-}
-
-src_install(){
-	default
-	rm -rf "${D}/usr/bin/" || die
-}
-- 
cgit v1.2.1