| 1 |
commit: a33ddfbcc32dbce0c8698d392e41a458cd14ccf4 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 5 10:47:39 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 10:49:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33ddfbc |
| 7 |
|
| 8 |
x11-misc/dunst: Drop USE=dunstify, fix deps |
| 9 |
|
| 10 |
- Set BDEPEND |
| 11 |
- Export PKG_CONFIG |
| 12 |
- Remove USE=dunstify |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 15 |
Bug: https://bugs.gentoo.org/740392 |
| 16 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 17 |
|
| 18 |
x11-misc/dunst/dunst-1.5.0.ebuild | 19 +++++++------------ |
| 19 |
x11-misc/dunst/dunst-9999.ebuild | 21 +++++++++------------ |
| 20 |
2 files changed, 16 insertions(+), 24 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-misc/dunst/dunst-1.5.0.ebuild b/x11-misc/dunst/dunst-1.5.0.ebuild |
| 23 |
index 5fd88619727..2e108755ce5 100644 |
| 24 |
--- a/x11-misc/dunst/dunst-1.5.0.ebuild |
| 25 |
+++ b/x11-misc/dunst/dunst-1.5.0.ebuild |
| 26 |
@@ -11,9 +11,8 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta |
| 27 |
LICENSE="BSD" |
| 28 |
SLOT="0" |
| 29 |
KEYWORDS="~amd64 ~arm ~x86" |
| 30 |
-IUSE="dunstify" |
| 31 |
|
| 32 |
-CDEPEND=" |
| 33 |
+DEPEND=" |
| 34 |
dev-libs/glib:2 |
| 35 |
sys-apps/dbus |
| 36 |
x11-libs/cairo[X,glib] |
| 37 |
@@ -22,15 +21,14 @@ CDEPEND=" |
| 38 |
x11-libs/libXScrnSaver |
| 39 |
x11-libs/libXinerama |
| 40 |
x11-libs/libXrandr |
| 41 |
+ x11-libs/libnotify |
| 42 |
x11-libs/pango[X] |
| 43 |
- dunstify? ( x11-libs/libnotify ) |
| 44 |
" |
| 45 |
-DEPEND=" |
| 46 |
- ${CDEPEND} |
| 47 |
+BDEPEND=" |
| 48 |
dev-lang/perl |
| 49 |
virtual/pkgconfig |
| 50 |
" |
| 51 |
-RDEPEND="${CDEPEND}" |
| 52 |
+RDEPEND="${DEPEND}" |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die |
| 56 |
@@ -38,16 +36,13 @@ src_prepare() { |
| 57 |
default |
| 58 |
} |
| 59 |
|
| 60 |
-src_compile() { |
| 61 |
- tc-export CC |
| 62 |
- emake |
| 63 |
- use dunstify && emake dunstify |
| 64 |
+src_configure() { |
| 65 |
+ tc-export CC PKG_CONFIG |
| 66 |
+ default |
| 67 |
} |
| 68 |
|
| 69 |
src_install() { |
| 70 |
emake DESTDIR="${D}" PREFIX="/usr" install |
| 71 |
|
| 72 |
- use dunstify && dobin dunstify |
| 73 |
- |
| 74 |
dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES |
| 75 |
} |
| 76 |
|
| 77 |
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild |
| 78 |
index e756b3ec1f8..f341b6af662 100644 |
| 79 |
--- a/x11-misc/dunst/dunst-9999.ebuild |
| 80 |
+++ b/x11-misc/dunst/dunst-9999.ebuild |
| 81 |
@@ -11,9 +11,8 @@ EGIT_REPO_URI="https://github.com/${PN}-project/${PN}" |
| 82 |
LICENSE="BSD" |
| 83 |
SLOT="0" |
| 84 |
KEYWORDS="" |
| 85 |
-IUSE="dunstify" |
| 86 |
|
| 87 |
-CDEPEND=" |
| 88 |
+DEPEND=" |
| 89 |
dev-libs/glib:2 |
| 90 |
sys-apps/dbus |
| 91 |
x11-libs/cairo[X,glib] |
| 92 |
@@ -22,15 +21,16 @@ CDEPEND=" |
| 93 |
x11-libs/libXScrnSaver |
| 94 |
x11-libs/libXinerama |
| 95 |
x11-libs/libXrandr |
| 96 |
+ x11-libs/libnotify |
| 97 |
x11-libs/pango[X] |
| 98 |
- dunstify? ( x11-libs/libnotify ) |
| 99 |
" |
| 100 |
-DEPEND=" |
| 101 |
- ${CDEPEND} |
| 102 |
+BDEPEND=" |
| 103 |
dev-lang/perl |
| 104 |
virtual/pkgconfig |
| 105 |
" |
| 106 |
-RDEPEND="${CDEPEND}" |
| 107 |
+RDEPEND=" |
| 108 |
+ ${DEPEND} |
| 109 |
+" |
| 110 |
|
| 111 |
src_prepare() { |
| 112 |
sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die |
| 113 |
@@ -38,16 +38,13 @@ src_prepare() { |
| 114 |
default |
| 115 |
} |
| 116 |
|
| 117 |
-src_compile() { |
| 118 |
- tc-export CC |
| 119 |
- emake |
| 120 |
- use dunstify && emake dunstify |
| 121 |
+src_configure() { |
| 122 |
+ tc-export CC PKG_CONFIG |
| 123 |
+ default |
| 124 |
} |
| 125 |
|
| 126 |
src_install() { |
| 127 |
emake DESTDIR="${D}" PREFIX="/usr" install |
| 128 |
|
| 129 |
- use dunstify && dobin dunstify |
| 130 |
- |
| 131 |
dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES |
| 132 |
} |
Archives