Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 32 insertions, 44 deletions

diff --git a/x11-misc/rofi/ChangeLog b/x11-misc/rofi/ChangeLog
index 0cfa1789f5d4..8478546aff92 100644
--- a/x11-misc/rofi/ChangeLog
+++ b/x11-misc/rofi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/rofi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/ChangeLog,v 1.5 2015/04/20 04:22:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/ChangeLog,v 1.6 2015/04/30 16:03:51 jer Exp $
+
+*rofi-0.15.4 (30 Apr 2015)
+
+  30 Apr 2015; Jeroen Roovers <jer@gentoo.org> -rofi-0.14.12.ebuild,
+  +rofi-0.15.4.ebuild, +files/rofi-0.15.4-Werror.patch:
+  Version bump.
 
 *rofi-0.15.2 (20 Apr 2015)
 
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 853c60f0dd57..b967fccc130b 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rofi-0.14.12-run_test_sh.patch 1008 SHA256 6faf504e33ebd2b9002301c2f34258723e80031ef602ab945f91e08a5085b32f SHA512 807842b62ad3391155667c7b94e925757764f59d1956c005b8e8d7674035519a0f5f5ac4921a253645b37d046282dfbb4da849a15f0e5efbcd2514af4821db1e WHIRLPOOL 43c3838dae4a5ac0ab6d8a3c690779fce3c438285b0047071cb1e721b906cbcec0e7b280c30abbe147fad7ee7adc705f020f7b05a12749e145f663acfc7c9f1e
-AUX rofi-0.14.9-optional-i3.patch 421 SHA256 f6a9915b939811a5c59613a5b52d2c4863cd0139ab1f702b136026846185b3aa SHA512 92fa321416bdf2b9581b065dc3d60ade23ebd4d2a21f0a32adcf90dda37df39c46f9db860dac84d7ab9cd8d630046eedf204ab5626a92fbe822638499734b713 WHIRLPOOL 04f0e2f5f52dd0dee20a272db69656e7330d7f0754f6e56f648cf2544fffbfa7d7a56fa9116c63a5695526932bd24e700e5735ddaa9ed81e22eb54a558a1a2d9
 AUX rofi-0.15.2-Werror.patch 364 SHA256 123c87f9b689b1d1da7456ff11311d09da57ee1b0b8e3dee2bdeaa385fb2f7ee SHA512 8a010a097da87e6cd030d9f11d9198357e00b8c6456cb5027b90c3ce21389db7a654821e84bd4ffdaa7ae05cb2ddf3f23f735a8230166eebcf86bde76a1b212a WHIRLPOOL 5b5780dd9d18478f905a9cdfcadbf43b2ef5c4a5051caecfa19daf4aecc7cc76c627185516377cb2fd0b730987313d75b4210c9b1d55b99e650169a8052019c0
 AUX rofi-0.15.2-run_test_sh.patch 1032 SHA256 e3e5b87290b6a9fa32f78e18494faae13c286ae9656c1562ffdcc9c8bcb71409 SHA512 0ba01e545cb96fc4a259ea3247105ca1b4c81491dd88f3f57156d84b0ffb4e740a6837852c1c0ae1f58577ae0204f7f254a18ea07f96005a9a272581797faeaf WHIRLPOOL 6785eef8c335bd3a04aae05b1d7984ec556fe9ce6e8e16715569febc64e89b8f7a5122b21c4ce9fbb4c474d69aff62aed14345a6d7bed53b71a4b45b25bfab73
-DIST rofi-0.14.12.tar.xz 105384 SHA256 73a25f9930bfea3cc8fc321c3f97e1b4acaf2b0b0aa58ad514df53550c729591 SHA512 2e780bbea16da56d56b8a1644e5cb25e541e59aeb2ab06e250b326f1622aee9da9934f3b9db49eaf7c4aa3eb003219b077e3046ddb46130b92b763da1ac0bad9 WHIRLPOOL d622167b2fef3d473f5812a1cbe65a5300982246b9ac09010f2feef7fb0f632a62abc4e62ef2943ebc193da7f1dff9c860990725d7ffa4264d5a8f0ecd5beb82
+AUX rofi-0.15.4-Werror.patch 268 SHA256 f5f6d8b244a6c1c38871381897e5bc560b3b6ea916523a47f0e11af916606210 SHA512 b431ee4224a0df7c16244ea40ba4aac27944bf5492309751ad1e738661d638075339be1e337bf7fba7e5a0a57f23f572db545dea0cf6790cb6986b79c8a59190 WHIRLPOOL 24be82ab38ec5fc21e21b8d22af9ea2879304dbc6a71ab2351be33c31ca7ce371b2e92eeed4799cf43ca254dd13616e472575544c641210a7964db167acce272
 DIST rofi-0.15.2.tar.xz 113468 SHA256 64bf088ea7448a8da61d368eb3dfa150b13ade91bc2e2d8c30915e863ea6505c SHA512 b2f0a09e53f01a54bc1a471c5a61928d88372a539493447681176a18258e64414734bbda4d381a6ccc27626958afc84f2b9c9b6d5eaab4d7b5fce4227cb541d6 WHIRLPOOL 91c1ff8ff7f11336b2096032e8f6b8c7b869eba101233222c8755a76ca1f0b7c647f3801d268de3aee7435e74e75d2ea07533c4d0913b6dbfcc235b9077e73b2
-EBUILD rofi-0.14.12.ebuild 943 SHA256 ebe3badf97e226646c80af4c01edf8775f59c1938e57d7eb73eb5171bcd57a98 SHA512 4df02a1e5e01dfeb5553d354be03e9225a03dbec8fb0e9efeb86f405332fdc19ae4482873b25151df8c0c382f4eae9f58ac49488b42c5d177fd7d1ba52473a11 WHIRLPOOL b62830b1e6cd017ea3f4e989207e43cc9b3c7ea63d2d8f7a8d38fce20ddc2265ba150c666e25df5fc4b8c3ae9367a9ae60c18dd6cf9ba947060671009d3d7a59
+DIST rofi-0.15.4.tar.xz 118912 SHA256 b4a9417021eb0368c257f86b5e89cdce419360fec0eb510206c05be271ac7bc1 SHA512 cc725aaceb685b45dfe3c853cee7781e37d6522a3d4fdc5196b376e8a724009458b2343cd986ca4c0b679090180e9244cc00c37c8b00dd8a39b8977bf3c25278 WHIRLPOOL f84ad1b8e9dd3a15c3ba43648b110f96f90f97d836182df138374b953ac7771328ba8af0234aeeba498dbefadb3814acedc3c7439a34ad5fe81ce4041bf04575
 EBUILD rofi-0.15.2.ebuild 986 SHA256 c12561683faee5a192d7eef37f9775a024882a1fe989f063597f8ef915f57445 SHA512 da9e6ce4cb8d828140463a8798b229b03c1c635b8912469e8e16e162f25b35bc66151ce455c087c53ad991398aa77fe4141d337f25796ef78f05506e232cf89f WHIRLPOOL 959bde4a17deba1f5367165dcd59c4019020554ffc147a3afdc4e08367405e020e4f23577f98675a0492e7243833b30d25aed17c691175745246494edf6fbe67
-MISC ChangeLog 1105 SHA256 1cb7516d129c43f8f1a95eb6f3deaacd76c1a8b4fddcf87716ba4d6b51199bdc SHA512 cc99499e7e366ed3c0183ea62d63323eaa4f9b63f90d140728967a0153d02c44e23f4ea3459ba83f1a91b90b1e2bdfd45666a48eb813840a2d3593eb7b54f9b6 WHIRLPOOL 25ccf354856e57ef870a6bbbf67b4b0de6b01e30bd21275d5dcd113ca2163a2ae88f3db73e9aee3fbdf1ffa21673a7ed5c29896e4b1f32d146c8809a813b5f6a
+EBUILD rofi-0.15.4.ebuild 937 SHA256 1927ef35e82b8667a0b9b80c101de354f84e31e8b2184a235dc279131052ddbf SHA512 9f3491cd051126d0163e24598cb7f61aea1e26a3ace3b8d7edc6a2b0cb0540269a92ca1540f05687240b84993d1df3a0899c117b095484f44ac6cc5a07874ca8 WHIRLPOOL 618bddcfdbfd3e8a9923d5ee5463cfa6d024d8fbc80e52c0fac9cd6c2ca9dff3c7f4c005af20a8b3644adbb4c7674e207593af5fa09a3474655535540fb17ac9
+MISC ChangeLog 1275 SHA256 61ea89ae10ff8a1cf100703db72d76ecb217433c304f52c5c7928d17666dcef2 SHA512 c6d3a2b8ab48516d8e3b448f5fbfff34b2297eb33572694961f9292e09b860f74c1dfc15acb714704ec8a65233af97ca9959ac53f5f0569830b136d772d37fc9 WHIRLPOOL c983e2cb971eb0a9d62a35509279ad7048a011cce75d65d70e1d62adf84856ad390b39e329776703a15a60b7f93a22c835518ce62cabe11ffcd8788795f9a0cc
 MISC metadata.xml 349 SHA256 7f69d55c450d5650f8843787a86c4af46bab477ce0efca378ebf5f9574245197 SHA512 145db443c2fcb987651ec44eb07fc8e32c560d01c25a39522552eee7ee0db17fa9a622adc3ee983f5c7ea12262f7e5829e8cddb6db64e99365fca9a5e66212b3 WHIRLPOOL 22e13e06a19f59849a1ec2cf3cf7ab518a4bbefa876e78fae0b6433bf97c2ad8e2e95cb731e8f19025ffda4ea00dad615c4c4e7db79bdb7f24997bd4e0162905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU0fwUACgkQVWmRsqeSphP+YwCcD3s5BgouXpF4d0vqOM6vtwPg
-rQsAnisDbF3qdHEMZVQqKKC9fpiRGnRb
-=dOr7
+iEYEAREIAAYFAlVCUmgACgkQVWmRsqeSphPzuwCfUWhe6sa568P7wX9hPAh7kmYG
+yqwAnR6tRIg9lmh+ZGpvZ0zoX+HkNbcZ
+=hD5m
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rofi/files/rofi-0.14.12-run_test_sh.patch b/x11-misc/rofi/files/rofi-0.14.12-run_test_sh.patch
deleted file mode 100644
index 980c45e2312f..000000000000
--- a/x11-misc/rofi/files/rofi-0.14.12-run_test_sh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -120,10 +120,3 @@
- test: ${bin_PROGRAMS} 
- 	./rofi_test
- 	./helper_test
--	$(top_srcdir)/test/run_test.sh 123 $(top_builddir)/textbox_test $(top_builddir) $(top_srcdir)/doc/example.xresources
--	$(top_srcdir)/test/run_test.sh 200 $(top_srcdir)/test/run_errormsg_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
--	$(top_srcdir)/test/run_test.sh 201 $(top_srcdir)/test/run_switchdialog_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
--	$(top_srcdir)/test/run_test.sh 202 $(top_srcdir)/test/run_dmenu_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
--	$(top_srcdir)/test/run_test.sh 203 $(top_srcdir)/test/run_dmenu_custom_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
--	$(top_srcdir)/test/run_test.sh 204 $(top_srcdir)/test/run_run_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
--	$(top_srcdir)/test/run_test.sh 205 $(top_srcdir)/test/run_script_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources
diff --git a/x11-misc/rofi/files/rofi-0.14.9-optional-i3.patch b/x11-misc/rofi/files/rofi-0.14.9-optional-i3.patch
deleted file mode 100644
index 5a0893addfc7..000000000000
--- a/x11-misc/rofi/files/rofi-0.14.9-optional-i3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,8 +21,11 @@
- ##
- # I3 check
- ##
--AC_CHECK_HEADERS([i3/ipc.h],
--	[i3_header=yes; break;])
-+AC_ARG_WITH(i3,
-+        [  --with-i3               compile in support for the i3 window manager],
-+		AS_IF([test "x$with_i3" != xno], 
-+        AC_CHECK_HEADERS([i3/ipc.h],
-+	    [i3_header=yes; break;])))
- 
- 
- dnl ---------------------------------------------------------------------
diff --git a/x11-misc/rofi/files/rofi-0.15.4-Werror.patch b/x11-misc/rofi/files/rofi-0.15.4-Werror.patch
new file mode 100644
index 000000000000..bffd15008536
--- /dev/null
+++ b/x11-misc/rofi/files/rofi-0.15.4-Werror.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@
+ ##
+ # Setup automake to be silent and in foreign mode.
+ ##
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-xz])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-xz])
+ AM_SILENT_RULES([yes])
+ 
+ ##
diff --git a/x11-misc/rofi/rofi-0.14.12.ebuild b/x11-misc/rofi/rofi-0.15.4.ebuild
index e94f85203c21..beff6a628acb 100644
--- a/x11-misc/rofi/rofi-0.14.12.ebuild
+++ b/x11-misc/rofi/rofi-0.15.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/rofi-0.14.12.ebuild,v 1.2 2014/12/19 13:54:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/rofi-0.15.4.ebuild,v 1.1 2015/04/30 16:03:51 jer Exp $
 
 EAPI=5
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
 HOMEPAGE="https://davedavenport.github.io/rofi/"
@@ -32,13 +32,14 @@ DEPEND="
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-0.14.9-optional-i3.patch \
-		"${FILESDIR}"/${PN}-0.14.12-run_test_sh.patch
+		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
+
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_with i3)
+	tc-export CC
+	econf $(usex i3 '' --disable-i3support)
 }
 
 src_test() {