[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi/

[Jeroen Roovers]

commit:     3a525d8e10d7150b04ad8be0ba96c8fbff524c11
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 05:30:47 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 05:30:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a525d8e

x11-misc/rofi: Version bump.

Package-Manager: portage-2.2.24

 x11-misc/rofi/Manifest                             |  3 +-
 .../{rofi-0.15.7.ebuild => rofi-0.15.11.ebuild}    |  8 +++-
 x11-misc/rofi/rofi-0.15.8.ebuild                   | 47 ----------------------
 3 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 735ebb1..8070f79 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,3 +1,2 @@
 DIST rofi-0.15.10.tar.xz 136156 SHA256 
c297771e7b6f0c8aef4be27ec7f8e5ab3138c558afddef188f7787d6a84d7326 SHA512 
8fdbc7a06a1cb83e6fa891175d8892398566df272ca5e771724a75726c0d675aff73d8e34ad251de1064745f3a6580aac2e02dd02664f0c78f4deb5bc3256bbc
 WHIRLPOOL 
ed266202019e4959d2c759d1ecef3c1b2e2d3a7a12a5eedbe90ffeba95a3a41f39472f3e992cf6373c231b1f6e2f8063fd2557c844006e4a11b9b9414688c9ee
-DIST rofi-0.15.7.tar.xz 125824 SHA256 
8c35d3d2a36cc61ae6b5dcc6a07a590e3d6d446944ec6e37dd5a3c3fcff64188 SHA512 
51caaaf6f2280c24b65386a3e38591b601e06f9d7ffa132023c93d86cb9ccf8ac1d1e2dec6886128ebdac6558fae3c718c21e489c4bd13575aeee2143ecdac13
 WHIRLPOOL 
a9de957c8cee9682608c35363d1142ec624fb4ce8f22c96da9dc35259afab599fd48dc1e9d528c287fecaa5e1a3c20efe51f1c9159913d7aa7878bbd98814578
-DIST rofi-0.15.8.tar.xz 129980 SHA256 
13aa2194c87f183c217069292092b38b9ab12115abb0bf312c6d48b22c3b369f SHA512 
9c43bdef60a229af371e992a0363e81d5bc09704e5579ffce38c6f0218df9e7607efe13744b700d8b3fa01f3654193afa2f95cd86383ab668573b51902030bb6
 WHIRLPOOL 
3c9863cafecd606d4f7514328bc3434e60b2bf24faa3f77478c836efa4ea3e4c7037eb4588a76ae23c29294504c9a5b983a86f59ca2c784520a66fadd3f2ce18
+DIST rofi-0.15.11.tar.xz 135316 SHA256 
0e32d5d41d7aa919e0f632ae08585f4197d58bbec4dc55d376657aab7887e672 SHA512 
e9ab0ca1de0028044d1788781e19b65da0683ad7388992e4d1956acbdf50ca1035fd20213bfc7dabfcd95f5f29cea620e60e71374b81b38a4bdcdc1057ab16f8
 WHIRLPOOL 
7f26f2a98c0f2521d3162b14c7ac38e5a5290cc13b473b6b4ed78c0795ab7c143daded2f264ec025d56e395be252cc2dd6cd580b43363f8ce81b17020e4679eb

diff --git a/x11-misc/rofi/rofi-0.15.7.ebuild 
b/x11-misc/rofi/rofi-0.15.11.ebuild
similarity index 83%
rename from x11-misc/rofi/rofi-0.15.7.ebuild
rename to x11-misc/rofi/rofi-0.15.11.ebuild
index 6de1ac9..e21134b 100644
--- a/x11-misc/rofi/rofi-0.15.7.ebuild
+++ b/x11-misc/rofi/rofi-0.15.11.ebuild
@@ -12,7 +12,8 @@ 
SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="i3"
+IUSE="i3 windowmode"
+REQUIRED_USE="i3? ( windowmode )"
 
 RDEPEND="
        dev-libs/glib:2
@@ -21,6 +22,7 @@ RDEPEND="
        x11-libs/libXft
        x11-libs/libXinerama
        x11-libs/pango[X]
+       x11-libs/startup-notification
        i3? ( x11-wm/i3 )
 "
 DEPEND="
@@ -39,7 +41,9 @@ src_prepare() {
 
 src_configure() {
        tc-export CC
-       econf $(usex i3 '' --disable-i3support)
+       econf \
+               $(use_enable windowmode) \
+               $(usex i3 '' --disable-i3support)
 }
 
 src_test() {

diff --git a/x11-misc/rofi/rofi-0.15.8.ebuild b/x11-misc/rofi/rofi-0.15.8.ebuild
deleted file mode 100644
index 6de1ac9..0000000
--- a/x11-misc/rofi/rofi-0.15.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://davedavenport.github.io/rofi/";
-SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="i3"
-
-RDEPEND="
-       dev-libs/glib:2
-       media-libs/freetype
-       x11-libs/libX11
-       x11-libs/libXft
-       x11-libs/libXinerama
-       x11-libs/pango[X]
-       i3? ( x11-wm/i3 )
-"
-DEPEND="
-       ${RDEPEND}
-       x11-proto/xineramaproto
-       x11-proto/xproto
-       virtual/pkgconfig
-"
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-0.15.4-Werror.patch
-
-       eautoreconf
-}
-
-src_configure() {
-       tc-export CC
-       econf $(usex i3 '' --disable-i3support)
-}
-
-src_test() {
-       emake test
-}