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

[Michał Górny]

commit:     79f89dbd01e97c279c4ccf0d2453b1834d97934c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 29 22:05:46 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 22:22:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f89dbd

x11-libs/libtinynotify-cli: Modernize to EAPI=6

 .../libtinynotify-cli-1.2.1.ebuild                 | 19 +++++++-----
 .../libtinynotify-cli-9999.ebuild                  | 35 +++++++++++-----------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
index 589149d0761..d71dbc25ec9 100644
--- a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=6
 
 MY_P=tinynotify-send-${PV}
 DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
@@ -15,20 +13,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"
 
-RDEPEND="x11-libs/libtinynotify"
+RDEPEND="x11-libs/libtinynotify:0="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
-DOCS=( README )
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	local myeconfargs=(
+	local myconf=(
 		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
 		--disable-regular
 		--disable-system-wide
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }

diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
index d8bd6197d4b..101e5c63616 100644
--- a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
@@ -1,45 +1,44 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
 EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git"
-
-inherit git-r3
-#endif
-
-inherit autotools-utils
+inherit autotools git-r3
 
 MY_P=tinynotify-send-${PV}
 DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
 HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
+SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libtinynotify:0="
 DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-1.18
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-DEPEND="${DEPEND}
-	>=dev-util/gtk-doc-1.18"
-#endif
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	local myeconfargs=(
+	local myconf=(
 		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
 		--disable-regular
 		--disable-system-wide
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }