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

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 7 insertions, 58 deletions

diff --git a/x11-misc/rofi/ChangeLog b/x11-misc/rofi/ChangeLog
index d6e7ea09112b..ebbfad1d7e28 100644
--- 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/files/rofi-0.14.9-test.patch b/x11-misc/rofi/files/rofi-0.14.9-test.patch
deleted file mode 100644
index 4a78ebcf3e2c..000000000000
--- 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 90c3355ecb79..e94f85203c21 100644
--- 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
index 864a18b1a49a..000000000000
--- 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
-}