1 |
commit: 386f97becb286dada4536bf84d1fead0b40b3f5f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 29 22:15:29 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 29 22:22:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386f97be |
7 |
|
8 |
x11-misc/sw-notify-send: Modernize to EAPI=6 |
9 |
|
10 |
.../sw-notify-send/sw-notify-send-1.2.1.ebuild | 12 ++++----- |
11 |
x11-misc/sw-notify-send/sw-notify-send-9999.ebuild | 30 ++++++++-------------- |
12 |
2 files changed, 15 insertions(+), 27 deletions(-) |
13 |
|
14 |
diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild |
15 |
index 1f96cdc570a..67c06dc2d15 100644 |
16 |
--- a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild |
17 |
+++ b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild |
18 |
@@ -1,9 +1,7 @@ |
19 |
# Copyright 1999-2017 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
-EAPI=4 |
23 |
- |
24 |
-inherit autotools-utils |
25 |
+EAPI=5 |
26 |
|
27 |
MY_P=tinynotify-send-${PV} |
28 |
DESCRIPTION="A system-wide variant of tinynotify-send" |
29 |
@@ -15,9 +13,9 @@ SLOT="0" |
30 |
KEYWORDS="~amd64 ~x86" |
31 |
IUSE="" |
32 |
|
33 |
-RDEPEND="x11-libs/libtinynotify |
34 |
+RDEPEND="x11-libs/libtinynotify:0= |
35 |
~x11-libs/libtinynotify-cli-${PV} |
36 |
- x11-libs/libtinynotify-systemwide" |
37 |
+ x11-libs/libtinynotify-systemwide:0=" |
38 |
DEPEND="${RDEPEND} |
39 |
virtual/pkgconfig" |
40 |
|
41 |
@@ -25,11 +23,11 @@ DOCS=( README ) |
42 |
S=${WORKDIR}/${MY_P} |
43 |
|
44 |
src_configure() { |
45 |
- myeconfargs=( |
46 |
+ local myconf=( |
47 |
--disable-library |
48 |
--disable-regular |
49 |
--enable-system-wide |
50 |
) |
51 |
|
52 |
- autotools-utils_src_configure |
53 |
+ econf "${myconf[@]}" |
54 |
} |
55 |
|
56 |
diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild |
57 |
index f849a3a13dd..c0ac15bb55e 100644 |
58 |
--- a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild |
59 |
+++ b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild |
60 |
@@ -3,47 +3,37 @@ |
61 |
|
62 |
EAPI=5 |
63 |
|
64 |
-#if LIVE |
65 |
-AUTOTOOLS_AUTORECONF=yes |
66 |
EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git" |
67 |
- |
68 |
-inherit git-r3 |
69 |
-#endif |
70 |
- |
71 |
-inherit autotools-utils |
72 |
+inherit autotools git-r3 |
73 |
|
74 |
MY_P=tinynotify-send-${PV} |
75 |
DESCRIPTION="A system-wide variant of tinynotify-send" |
76 |
HOMEPAGE="https://github.com/mgorny/tinynotify-send/" |
77 |
-SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2" |
78 |
+SRC_URI="" |
79 |
|
80 |
LICENSE="BSD" |
81 |
SLOT="0" |
82 |
-KEYWORDS="~amd64 ~x86" |
83 |
+KEYWORDS="" |
84 |
IUSE="" |
85 |
|
86 |
RDEPEND="x11-libs/libtinynotify:0= |
87 |
~x11-libs/libtinynotify-cli-${PV} |
88 |
x11-libs/libtinynotify-systemwide:0=" |
89 |
DEPEND="${RDEPEND} |
90 |
+ dev-util/gtk-doc |
91 |
virtual/pkgconfig" |
92 |
|
93 |
-S=${WORKDIR}/${MY_P} |
94 |
- |
95 |
-#if LIVE |
96 |
-EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} |
97 |
-KEYWORDS= |
98 |
-SRC_URI= |
99 |
-DEPEND="${DEPEND} |
100 |
- dev-util/gtk-doc" |
101 |
-#endif |
102 |
+src_prepare() { |
103 |
+ default |
104 |
+ eautoreconf |
105 |
+} |
106 |
|
107 |
src_configure() { |
108 |
- myeconfargs=( |
109 |
+ local myconf=( |
110 |
--disable-library |
111 |
--disable-regular |
112 |
--enable-system-wide |
113 |
) |
114 |
|
115 |
- autotools-utils_src_configure |
116 |
+ econf "${myconf[@]}" |
117 |
} |