Fixed cairo dependency, bug #256898.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 33 insertions, 109 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/Manifest b/x11-wm/awesome/Manifest
index 163400bb62e3..fc175801a09a 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -5,11 +5,9 @@ DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d
 DIST awesome-2.3.5.tar.gz 230884 RMD160 a59df028c26f0d42e46240ffc81371585d35e3ff SHA1 52b142646af872f206d8178cd55afec1af2bff73 SHA256 50e107ae67a4eb0bbdb3e9975a6bd43e3435db4d8c2493031479930bfcc329cb
 DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64 SHA1 237a05f931a3889bfbcc9e31aaf4c56e55b3272a SHA256 9a4fa26f069223714d584b6b19f017f67808f83aa5788e6ae25c1f71001b9d4c
 DIST awesome-3.1.1.tar.bz2 238418 RMD160 f03d1f277a804dcee5c3347fdc604e04a6b873c3 SHA1 79f9db9f11e5606d828fa4ae176305c8dbf3bcb9 SHA256 8de829e54b4be68aeda3e1ffa139054e1ceba51243b6c859172e3d235519cb8f
-DIST awesome-3.1.tar.bz2 238280 RMD160 493213e1551ab9f7a633af07db0af7692bcb8d8b SHA1 ddb1733f6fea1b0f875e4d6ae3aad54d97fa148d SHA256 95767eeeb9526c468ab9cb85edea74f19dde57da899244ffc7570ca4466fa1ff
-EBUILD awesome-2.3.4.ebuild 1273 RMD160 25882c7c747f63fb73988bd41791d23646c60168 SHA1 00f6d5a826cbcc9df477d07941578ed30a1f5ccb SHA256 363ecafafc99023015704dedf621ec712636bc59f69e179d93f5b016b0f95c5d
-EBUILD awesome-2.3.5.ebuild 1277 RMD160 fb637944d24752871bb53666095619154aa6eb53 SHA1 795543622548c00aef997494166d9e67faab9b7f SHA256 150c103c535b7772771aea39b3a787ed9f294d4c489f95fe2e82def7ade56782
+EBUILD awesome-2.3.4.ebuild 1697 RMD160 a51b0bd2e15093b84ba29b2b4406f3df03d78de3 SHA1 a3f70c3dd8c0ad0454a4c91f6433d166c3a58749 SHA256 4a1780331c5b52d39fee91fe6c00757d80df413988c246f3fe9c5c613c58309b
+EBUILD awesome-2.3.5.ebuild 1701 RMD160 aa57e98aa6dd2732699e6b73785d3110f775eeba SHA1 eea2e21cd1d8ffc58c3736326b507ccc0bd78009 SHA256 e32aca58a56f98a44599d4767f92fde3ccad95faf61dd583d9c75d4ab7f3421e
 EBUILD awesome-3.0-r1.ebuild 3040 RMD160 ecb3391d332757b6a3dcb1b9a42f981474baf96e SHA1 d9890b2e7e5cd015fb2f9fab54d5e724580fd525 SHA256 9676e83ab0b0bb69604eba9969331a23841dc98193537cd056f8934c38c2b05b
-EBUILD awesome-3.1-r1.ebuild 2165 RMD160 7d6cd279abf72135291312c180a690aada39c0b8 SHA1 e66be4401ef01864c9dc565556ead72fa136705e SHA256 0da6fd2bcd837ec7708dfcebf53b9ac3f9661982bc632fd0ca3b6d77b73ac77d
 EBUILD awesome-3.1.1.ebuild 2120 RMD160 301820152e29e6ce39cb6d377ae687e4f59afc17 SHA1 738968d39df6ef359a502c1e9f6a85145048518e SHA256 a353d9da724b8e7ae0c52f3713d5fec7450d042ff51c21bbc98adaca30093c61
-MISC ChangeLog 7416 RMD160 19cf51f5cfad7c81e0ddbfe1de7c38adee406a05 SHA1 ddc56bd03e2805210fd4321ff4651f0d2e302ee0 SHA256 424bfc44caa6744294d0f3ec3860b1d35930f4668efd1be58b314c9f5e8bd385
+MISC ChangeLog 7596 RMD160 f4ad89d90eec95178029d6d50c9f5033359d3bf5 SHA1 04c94d83213d0a49d6734a5077914fdcd42876dc SHA256 6684f34ca34c06015347a4c97c491826e3fa7654b3ac96fbf66bb08f78d6a130
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
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
-}