Fixed dependency.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 139 insertions, 2 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 068afc9ce6f6..7aa199242d51 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.38 2008/09/23 07:17:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.39 2008/10/13 23:39:01 matsuu Exp $
+
+*awesome-3.0-r1 (13 Oct 2008)
+
+  13 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/awesome-3.0-gentoo.patch, +awesome-3.0-r1.ebuild:
+  Fixed dependency.
 
   23 Sep 2008; Markus Rothe <corsair@gentoo.org> awesome-3.0.ebuild:
   Added ~ppc
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 69203600b5fc..45299c0638bb 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,3 +1,4 @@
+AUX awesome-3.0-gentoo.patch 355 RMD160 787050e5f1dc8d8ff16477e77496763318db1fe9 SHA1 d004b93c608afffbaee0cccea17e8cd02592580d SHA256 f76c7cad9cf92c7a0d205b0c8f4b0b9debff98944ee618abbb8fb5eda14a74bf
 AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-2.3.2.tar.gz 230593 RMD160 02bfaf317d849991a52e0d8a1bcdfd415798ae1d SHA1 d49ceec58c456fff696432d2226f4eb10d2f605b SHA256 5d2079e6c9add9bfcd2a598a6dfe6e544b0f5bbe9c96731a18c132a70a3af348
@@ -5,6 +6,7 @@ DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d
 DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64 SHA1 237a05f931a3889bfbcc9e31aaf4c56e55b3272a SHA256 9a4fa26f069223714d584b6b19f017f67808f83aa5788e6ae25c1f71001b9d4c
 EBUILD awesome-2.3.2.ebuild 1271 RMD160 82a731b5442abe3eda49c47056c2953d2b59c87b SHA1 e1f48a408f5a962dc716c0e404e04bb734ec1b4b SHA256 8f8e04baf39b2eb54ecdd8254b36b43912fad5995fa4dd75595319526c831525
 EBUILD awesome-2.3.4.ebuild 1277 RMD160 32f03de382745f915691114210e161fdf082db0a SHA1 601cf947c22928940993ed9cc0e343aec746c50e SHA256 9def271a20a6492a55e2a6f717c0ba13cc8cca945181a0d177cda88366ac2969
+EBUILD awesome-3.0-r1.ebuild 3040 RMD160 ecb3391d332757b6a3dcb1b9a42f981474baf96e SHA1 d9890b2e7e5cd015fb2f9fab54d5e724580fd525 SHA256 9676e83ab0b0bb69604eba9969331a23841dc98193537cd056f8934c38c2b05b
 EBUILD awesome-3.0.ebuild 2112 RMD160 ecb502716ce1aae706cb9a04d174aeede9eeac39 SHA1 6cf1520e3c338cf4e169b49c87149d6c90522554 SHA256 c4c78adb1b72c1c9e39d338d43849f928b673d206f9fc44bd7f636738fd724cd
-MISC ChangeLog 5400 RMD160 5b0828c3e063d3a357ac26f1b7a525c4d0d85f69 SHA1 4ab6e750e99c3d4ee693aa84b8745af619c1f08c SHA256 757b37bb9a477afd94dbf1d8ec64f316116b15cd582081a087b0020d6a756a8c
+MISC ChangeLog 5559 RMD160 1f5d27f62dcba4ce303af9231efc77e770c99899 SHA1 65b567c0f921b353225c72c169022ea738293f49 SHA256 ae6cfe50d36a13c67c5933bf3369fa26834b137a4d8a824702e034a11ee89bd5
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-3.0-r1.ebuild b/x11-wm/awesome/awesome-3.0-r1.ebuild
new file mode 100644
index 000000000000..b283fa3cd077
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.0-r1.ebuild
@@ -0,0 +1,118 @@
+# 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.0-r1.ebuild,v 1.1 2008/10/13 23:39:01 matsuu Exp $
+
+EAPI=1
+
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#IUSE="dbus doc +imlib bash-completion"
+IUSE="dbus doc +imlib"
+
+RDEPEND=">=dev-lang/lua-5.1
+	>=dev-libs/glib-2
+	dev-libs/libev
+	dev-util/gperf
+	sys-libs/ncurses
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.1
+	x11-libs/pango
+	>=x11-libs/xcb-util-0.3
+	dbus? ( >=sys-apps/dbus-1 )
+	imlib? ( media-libs/imlib2 )
+	!imlib? ( >=x11-libs/gtk+-2.2 )"
+
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/cmake-2.6
+	dev-util/pkgconfig
+	x11-proto/xcb-proto
+	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-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 )
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+pkg_setup() {
+	if ! built_with_use --missing false x11-libs/cairo xcb ; then
+		eerror "Your x11-libs/cairo packagehas been built without xcb support,"
+		eerror "please enable the 'xcb' 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 xcb support"
+	fi
+	if ! built_with_use --missing false x11-libs/libX11 xcb ; then
+		eerror "Your x11-libs/libX11 packagehas been built without xcb support,"
+		eerror "please enable the 'xcb' USE flag and re-emerge x11-libs/libX11."
+		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/libX11 missing xcb support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	local myargs="all"
+
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with imlib IMLIB2)
+		$(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
+		dohtml -r "${WORKDIR}"/${PN}_build/doc/html/* || 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
+}
diff --git a/x11-wm/awesome/files/awesome-3.0-gentoo.patch b/x11-wm/awesome/files/awesome-3.0-gentoo.patch
new file mode 100644
index 000000000000..202b2248c20d
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.0-gentoo.patch
@@ -0,0 +1,11 @@
+diff -Naur awesome-3.0.orig/awesomeConfig.cmake awesome-3.0/awesomeConfig.cmake
+--- awesome-3.0.orig/awesomeConfig.cmake	2008-09-18 23:12:42.000000000 +0900
++++ awesome-3.0/awesomeConfig.cmake	2008-10-14 01:43:22.000000000 +0900
+@@ -135,6 +135,7 @@
+     cairo
+     pango
+     pangocairo
++    x11-xcb
+     xcb-randr
+     xcb-xinerama
+     xcb-event>=0.3.0