commit: a33ddfbcc32dbce0c8698d392e41a458cd14ccf4 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Sep 5 10:47:39 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Sep 5 10:49:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33ddfbc
x11-misc/dunst: Drop USE=dunstify, fix deps - Set BDEPEND - Export PKG_CONFIG - Remove USE=dunstify Package-Manager: Portage-3.0.5, Repoman-3.0.1 Bug: https://bugs.gentoo.org/740392 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> x11-misc/dunst/dunst-1.5.0.ebuild | 19 +++++++------------ x11-misc/dunst/dunst-9999.ebuild | 21 +++++++++------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/x11-misc/dunst/dunst-1.5.0.ebuild b/x11-misc/dunst/dunst-1.5.0.ebuild index 5fd88619727..2e108755ce5 100644 --- a/x11-misc/dunst/dunst-1.5.0.ebuild +++ b/x11-misc/dunst/dunst-1.5.0.ebuild @@ -11,9 +11,8 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="dunstify" -CDEPEND=" +DEPEND=" dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] @@ -22,15 +21,14 @@ CDEPEND=" x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libnotify x11-libs/pango[X] - dunstify? ( x11-libs/libnotify ) " -DEPEND=" - ${CDEPEND} +BDEPEND=" dev-lang/perl virtual/pkgconfig " -RDEPEND="${CDEPEND}" +RDEPEND="${DEPEND}" src_prepare() { sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die @@ -38,16 +36,13 @@ src_prepare() { default } -src_compile() { - tc-export CC - emake - use dunstify && emake dunstify +src_configure() { + tc-export CC PKG_CONFIG + default } src_install() { emake DESTDIR="${D}" PREFIX="/usr" install - use dunstify && dobin dunstify - dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES } diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index e756b3ec1f8..f341b6af662 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-9999.ebuild @@ -11,9 +11,8 @@ EGIT_REPO_URI="https://github.com/${PN}-project/${PN}"; LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="dunstify" -CDEPEND=" +DEPEND=" dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] @@ -22,15 +21,16 @@ CDEPEND=" x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr + x11-libs/libnotify x11-libs/pango[X] - dunstify? ( x11-libs/libnotify ) " -DEPEND=" - ${CDEPEND} +BDEPEND=" dev-lang/perl virtual/pkgconfig " -RDEPEND="${CDEPEND}" +RDEPEND=" + ${DEPEND} +" src_prepare() { sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die @@ -38,16 +38,13 @@ src_prepare() { default } -src_compile() { - tc-export CC - emake - use dunstify && emake dunstify +src_configure() { + tc-export CC PKG_CONFIG + default } src_install() { emake DESTDIR="${D}" PREFIX="/usr" install - use dunstify && dobin dunstify - dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES }
