x11-libs/xapps: [QA] Various fixes

Package-Manager: portage-2.3.2

diff --git a/x11-libs/xapps/xapps-1.0.2-r1.ebuild b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
index 7bc074f1e0de807f55142dbdec5cef04e7f9d836..79c380c7799cbb85aa7eb6f5c65710046a9e6167 100644 (file)
--- a/x11-libs/xapps/xapps-1.0.2-r1.ebuild
+++ b/x11-libs/xapps/xapps-1.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit autotools gnome2-utils
+inherit autotools gnome2-utils xdg-utils
 
 DESCRIPTION="Cross-desktop libraries and common resources"
 HOMEPAGE="https://github.com/linuxmint/xapps/"
@@ -14,37 +14,40 @@ SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
 SLOT="0"
-IUSE="static-libs"
+IUSE="introspection static-libs"
 
 RDEPEND="
        >=dev-libs/glib-2.37.3:2
+       dev-libs/gobject-introspection:0=
        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/gdk-pixbuf-2.22.0:2[introspection?]
+       >=x11-libs/gtk+-3.3.16:3[introspection?]
        x11-libs/libxkbfile
 "
-
 DEPEND="${RDEPEND}
-       "
+       sys-devel/gettext
+"
 
 src_prepare() {
-       eapply_user
+       xdg_environment_reset
+       default
        eautoreconf
 }
 
 src_configure() {
        econf \
-               $(use_enable static-libs static) \
-               $(use_enable introspection)
+               $(use_enable introspection) \
+               $(use_enable static-libs static)
 }
 
 src_install() {
        default
-       rm -rf "${D}/usr/bin/" || die
-       [ use static-libs ] || rm -rf "${D}/usr/lib64/libxapp.la" || die
+       rm -rf "${ED%/}"/usr/bin || die
+
+       # package provides .pc files
+       find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {