[gentoo-commits] repo/gentoo:master commit in: x11-libs/xapps/

[Kristian Fiskerstrand]

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
 }