Depend on x11-libs/pango[X] (bug #533014 by Toralf Förster).

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

diff --git a/x11-misc/rofi/ChangeLog b/x11-misc/rofi/ChangeLog
index d6e7ea09112b3b2fba92365d6ac319cb94870c56..ebbfad1d7e28e3ddead27fc37fbaad6b67455e6b 100644 (file)
--- a/x11-misc/rofi/ChangeLog
+++ b/x11-misc/rofi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/rofi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/ChangeLog,v 1.3 2014/12/09 15:38:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/ChangeLog,v 1.4 2014/12/19 13:54:49 jer Exp $
+
+  19 Dec 2014; Jeroen Roovers <jer@gentoo.org> -rofi-0.14.9.ebuild,
+  rofi-0.14.12.ebuild, -files/rofi-0.14.9-test.patch:
+  Depend on x11-libs/pango[X] (bug #533014 by Toralf Förster).
 
 *rofi-0.14.12 (09 Dec 2014)
 

diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 5703a273438e184692392491b459d476a3378c18..f6c1886ce78f9cff715e445236bf4fcbfc75ff51 100644 (file)
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -3,17 +3,14 @@ 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.14.9-test.patch 96 SHA256 9b8840cf09f144871f98e1d191b2945c83ebb9d0657c38cdc701c84bbf9b417a SHA512 275f6c6fff2191c898a764caca2c67a33bdb02afc3ac2c79afdd5eda0ded0db0d64c74279a9a847e25e17c58c3597d032ef45680088241856a192dfe7cc03cc0 WHIRLPOOL fd456763bef86bb9797a71e0025146ea7c1d710d03e55e1c3d01697945b7c4826fd6f54f724013fffd2d06824b6b20a69f007c5dab3efcff45be0d7c3e6b748c
 DIST rofi-0.14.12.tar.xz 105384 SHA256 73a25f9930bfea3cc8fc321c3f97e1b4acaf2b0b0aa58ad514df53550c729591 SHA512 2e780bbea16da56d56b8a1644e5cb25e541e59aeb2ab06e250b326f1622aee9da9934f3b9db49eaf7c4aa3eb003219b077e3046ddb46130b92b763da1ac0bad9 WHIRLPOOL d622167b2fef3d473f5812a1cbe65a5300982246b9ac09010f2feef7fb0f632a62abc4e62ef2943ebc193da7f1dff9c860990725d7ffa4264d5a8f0ecd5beb82
-DIST rofi-0.14.9.tar.xz 103124 SHA256 19cd64bb521a30e25fae224e6a166a99a263e294d27805010f6ec64ffa0928a7 SHA512 da39ce7ae2f52fdc9bc162b8bd34d41671e7943764f6706f2e518068068aeb8cf3dd3915d1c421972991e9521202450142d4305aef5159d484d45b5e79f65d57 WHIRLPOOL f6e1776845ac5086c2b0c22effd55777f4c68ef3f49a30689725d1a27c08078133557ce0d9d6b75a20ae23b58abc6a02e269de977a5288ba2d16ef01af50914b
-EBUILD rofi-0.14.12.ebuild 940 SHA256 5f7eb9224e09fb9263aae7c3f1c105b2dab97e6328ae6e7240971cd1f96bc602 SHA512 1dc88e02e7c5a1ff68bace23461917c061f5e6230c6e40cb8acf66072fb9fc177e3d548f1a06ec38ea0344290e115153da2dec77b528eca3a51092bac6da2a99 WHIRLPOOL f57a8eee01d6454d9c5e4a66807178dbd09814c5541b93be5888d975aa20718164c4fe1a0811d9ca0bd43a7366ccba451a10152d6364a84b797de6f09bacd191
-EBUILD rofi-0.14.9.ebuild 938 SHA256 abffe4ad470ec304944903a1a4248fe3815be9a266d869dc7215870965e1bfd4 SHA512 c5f3f4aa2cebbbeaf0313d59f11ffd5d4766d6f18385e2dc7ec73c1386c6971bad5ff71ea77b2532e07c028fd0aa0e51903154f8b0f8561169434e79410af0e9 WHIRLPOOL 0291119601358a1d2a98db9f4104a5bf1cc54d1dbea59bd72898a7fe4132dfd5d4f10012e5a5bfb173677f2824e97fe87764aba5e54a0034ac118df338062ec2
-MISC ChangeLog 711 SHA256 b15351622e2ba800a06500f6d0b60551f4211aa46894d1a54f1542a9ef4b2796 SHA512 32c4d0e280c1c07ec2362a1bb3335be5f523a5054df1e9e68c422d84294fdcaa6f2f2dc1081d008ed1eb79acdd4765c3f577df9922f296491f1f1ee45c35bb32 WHIRLPOOL c93de749649c1a88ea5859d2dca711a9207c7265caf527a530615cf5c92d25d96d311eee4d07755bbf2a74dc1ad6592b04a4809146305b32a203f15b7505df5b
+EBUILD rofi-0.14.12.ebuild 943 SHA256 ebe3badf97e226646c80af4c01edf8775f59c1938e57d7eb73eb5171bcd57a98 SHA512 4df02a1e5e01dfeb5553d354be03e9225a03dbec8fb0e9efeb86f405332fdc19ae4482873b25151df8c0c382f4eae9f58ac49488b42c5d177fd7d1ba52473a11 WHIRLPOOL b62830b1e6cd017ea3f4e989207e43cc9b3c7ea63d2d8f7a8d38fce20ddc2265ba150c666e25df5fc4b8c3ae9367a9ae60c18dd6cf9ba947060671009d3d7a59
+MISC ChangeLog 898 SHA256 fb9b1d7c51eadb92d277389d53811c3c8eaf0801367c2e6b0467b44f6fbb85d2 SHA512 05ffe50610dbb7176c77d6eecc188ea298cc77afd6a68555ee77ffc002d8f8d8b3fe6b44fd1361be2423c232b94fdd2a23faf50fceb7dda13e1fb3e11105a3d4 WHIRLPOOL db19ac2656da125fc21324834ed52544a0bbd9e052a438e58d20df5a36eaef4fccc445c63e5be059fdce4621a9143471dfc1e60a615970fe9d2cd05904a54a10
 MISC metadata.xml 349 SHA256 7f69d55c450d5650f8843787a86c4af46bab477ce0efca378ebf5f9574245197 SHA512 145db443c2fcb987651ec44eb07fc8e32c560d01c25a39522552eee7ee0db17fa9a622adc3ee983f5c7ea12262f7e5829e8cddb6db64e99365fca9a5e66212b3 WHIRLPOOL 22e13e06a19f59849a1ec2cf3cf7ab518a4bbefa876e78fae0b6433bf97c2ad8e2e95cb731e8f19025ffda4ea00dad615c4c4e7db79bdb7f24997bd4e0162905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSHF5MACgkQVWmRsqeSphMwIQCdF+GRBIUETDK+M0eBN4xKe1KX
-eiMAn030FFmHcT2yiPiy35WG1iEej2tl
-=mS3+
+iEYEAREIAAYFAlSULisACgkQVWmRsqeSphOkOACeKInwdrmRrGBsZXmP/dWYlet4
+4h8An0cHxfZHfcbICdlDPAGmTHZVqsj8
+=eYhp
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/rofi/files/rofi-0.14.9-test.patch b/x11-misc/rofi/files/rofi-0.14.9-test.patch
deleted file mode 100644 (file)
index 4a78ebc..0000000
--- a/x11-misc/rofi/files/rofi-0.14.9-test.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,3 @@
--SUBDIRS=test
--
- ##
- # Rofi the program
- ##

diff --git a/x11-misc/rofi/rofi-0.14.12.ebuild b/x11-misc/rofi/rofi-0.14.12.ebuild
index 90c3355ecb79a77f539f569533633f004c39ac40..e94f85203c21a4e47aadc7ff34cd4e2fe99a7fbc 100644 (file)
--- a/x11-misc/rofi/rofi-0.14.12.ebuild
+++ b/x11-misc/rofi/rofi-0.14.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.1 2014/12/09 15:38:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/rofi-0.14.12.ebuild,v 1.2 2014/12/19 13:54:49 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -20,7 +20,7 @@ RDEPEND="
        x11-libs/libX11
        x11-libs/libXft
        x11-libs/libXinerama
-       x11-libs/pango
+       x11-libs/pango[X]
        i3? ( x11-wm/i3 )
 "
 DEPEND="

diff --git a/x11-misc/rofi/rofi-0.14.9.ebuild b/x11-misc/rofi/rofi-0.14.9.ebuild
deleted file mode 100644 (file)
index 864a18b..0000000
--- a/x11-misc/rofi/rofi-0.14.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rofi/rofi-0.14.9.ebuild,v 1.2 2014/10/06 08:48:42 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-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
-       i3? ( x11-wm/i3 )
-"
-DEPEND="
-       ${RDEPEND}
-       x11-proto/xineramaproto
-       x11-proto/xproto
-       virtual/pkgconfig
-"
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${P}-optional-i3.patch \
-               "${FILESDIR}"/${P}-test.patch
-       eautoreconf
-}
-
-src_configure() {
-       econf $(use_with i3)
-}
-
-src_test() {
-       emake -C test
-       emake -C test test
-}