Fixed cairo dependency, bug #256898.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 30 insertions, 104 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 0d2b4050a1a7..322777723402 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.52 2009/01/08 11:58:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.53 2009/02/01 15:16:24 matsuu Exp $
+
+  01 Feb 2009; MATSUU Takuto <matsuu@gentoo.org> awesome-2.3.4.ebuild,
+  awesome-2.3.5.ebuild, -awesome-3.1-r1.ebuild:
+  Fixed cairo dependency, bug #256898. Removed old version.
 
 *awesome-3.1.1 (08 Jan 2009)
 
diff --git a/x11-wm/awesome/awesome-2.3.4.ebuild b/x11-wm/awesome/awesome-2.3.4.ebuild
index 7e95e5a73885..848d7e5a84b2 100644
--- a/x11-wm/awesome/awesome-2.3.4.ebuild
+++ b/x11-wm/awesome/awesome-2.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild,v 1.4 2008/10/16 20:29:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.4.ebuild,v 1.5 2009/02/01 15:16:24 matsuu Exp $
 
 inherit toolchain-funcs eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc gtk"
 
 RDEPEND=">=dev-libs/confuse-2.6
+	x11-libs/cairo
 	x11-libs/pango
 	x11-libs/libX11
 	x11-libs/libXrandr
@@ -31,6 +32,16 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 	)"
 
+pkg_setup() {
+	if ! built_with_use --missing false x11-libs/cairo X ; then
+		eerror "Your x11-libs/cairo packagehas been built without X support,"
+		eerror "please enable the 'X' USE flag and re-emerge x11-libs/cairo."
+		elog "You can enable this USE flag either globally in /etc/make.conf,"
+		elog "or just for specific packages in /etc/portage/package.use."
+		die "x11-libs/cairo missing X support"
+	fi
+}
+
 src_compile() {
 	econf \
 		$(use_with gtk) \
diff --git a/x11-wm/awesome/awesome-2.3.5.ebuild b/x11-wm/awesome/awesome-2.3.5.ebuild
index 3d687a502d6c..903be6f9302a 100644
--- a/x11-wm/awesome/awesome-2.3.5.ebuild
+++ b/x11-wm/awesome/awesome-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild,v 1.1 2009/01/03 00:22:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.5.ebuild,v 1.2 2009/02/01 15:16:24 matsuu Exp $
 
 inherit toolchain-funcs eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc gtk"
 
 RDEPEND=">=dev-libs/confuse-2.6
+	x11-libs/cairo
 	x11-libs/pango
 	x11-libs/libX11
 	x11-libs/libXrandr
@@ -31,6 +32,16 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 	)"
 
+pkg_setup() {
+	if ! built_with_use --missing false x11-libs/cairo X ; then
+		eerror "Your x11-libs/cairo packagehas been built without X support,"
+		eerror "please enable the 'X' USE flag and re-emerge x11-libs/cairo."
+		elog "You can enable this USE flag either globally in /etc/make.conf,"
+		elog "or just for specific packages in /etc/portage/package.use."
+		die "x11-libs/cairo missing X support"
+	fi
+}
+
 src_compile() {
 	econf \
 		$(use_with gtk) \
diff --git a/x11-wm/awesome/awesome-3.1-r1.ebuild b/x11-wm/awesome/awesome-3.1-r1.ebuild
deleted file mode 100644
index f396c3c55f83..000000000000
--- a/x11-wm/awesome/awesome-3.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.1-r1.ebuild,v 1.2 2008/12/25 17:05:28 matsuu Exp $
-
-EAPI=2
-MY_P="${P/_/-}"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-#IUSE="dbus doc bash-completion"
-IUSE="dbus doc"
-
-RDEPEND=">=dev-lang/lua-5.1
-	>=dev-libs/glib-2
-	dev-libs/libev
-	dev-util/gperf
-	sys-libs/ncurses
-	x11-libs/cairo[xcb]
-	x11-libs/libX11[xcb]
-	>=x11-libs/libxcb-1.1
-	>=x11-libs/pango-1.19.3
-	>=x11-libs/xcb-util-0.3
-	media-libs/imlib2
-	dbus? ( >=sys-apps/dbus-1 )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/cmake-2.6
-	dev-util/pkgconfig
-	x11-proto/xcb-proto
-	>=x11-proto/xproto-7.0.11
-	doc? (
-		app-doc/doxygen
-		dev-util/luadoc
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${RDEPEND}
-	app-shells/bash
-	|| (
-		x11-misc/gxmessage
-		x11-apps/xmessage
-	)
-	|| (
-		x11-terms/eterm
-		x11-misc/habak
-		x11-wm/windowmaker
-		media-gfx/feh
-		x11-misc/hsetroot
-		( media-gfx/imagemagick x11-apps/xwininfo )
-		media-gfx/xv
-		x11-misc/xsri
-		media-gfx/xli
-		x11-apps/xsetroot
-	)"
-#		media-gfx/qiv (media-gfx/pqiv doesn't work)
-#		x11-misc/chbg #68116
-#	bash-completion? ( app-shells/bash-completion )
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_compile() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with dbus DBUS)"
-
-	if use doc ; then
-		mycmakeargs="${mycmakeargs} -DGENERATE_LUADOC=ON"
-		myargs="${myargs} doc"
-	else
-		mycmakeargs="${mycmakeargs} -DGENERATE_LUADOC=OFF"
-	fi
-	cmake-utils_src_compile ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${WORKDIR}"/${PN}_build/doc/html/ && dohtml -r * || die
-			mv "${D}"/usr/share/doc/${PN}/luadoc "${D}"/usr/share/doc/${PF}/html/luadoc || die
-		)
-	fi
-	rm -rf "${D}"/usr/share/doc/${PN} || die
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-}