Fixed dependency.

Package-Manager: portage-2.1.6.2/cvs/Linux 2.6.27-gentoo-r4 x86_64

4 files changed, 9 insertions, 104 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 934dc26455bf..ee6888a6348a 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
 # 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.49 2008/12/21 23:53:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.50 2008/12/25 17:05:28 matsuu Exp $
+
+  25 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> -awesome-3.1.ebuild,
+  awesome-3.1-r1.ebuild:
+  Fixed dependency. Removed old revision.
 
 *awesome-3.1-r1 (21 Dec 2008)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index e9cf389c2357..c7e8b199786a 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -6,7 +6,6 @@ DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64
 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-3.0-r1.ebuild 3040 RMD160 ecb3391d332757b6a3dcb1b9a42f981474baf96e SHA1 d9890b2e7e5cd015fb2f9fab54d5e724580fd525 SHA256 9676e83ab0b0bb69604eba9969331a23841dc98193537cd056f8934c38c2b05b
-EBUILD awesome-3.1-r1.ebuild 2156 RMD160 c46cc9f1b192ad0077e09c83b3d750b1c5cc6264 SHA1 5f871fdef996afbe4280e73abbb90079cfb6a034 SHA256 27e24efb218b29944afc09abb599e38578810847d4adf04661d1832dffba5790
-EBUILD awesome-3.1.ebuild 2136 RMD160 76935207c2b4f1e7fa12cb8e488133ca5879ba60 SHA1 8f3ef30bf85220b79ddfa80deb3bf3ba0a77194f SHA256 0091666cfc5358fd1089a7e9d1cfad0131ec2da55b256bb46dc50061bd56bea4
-MISC ChangeLog 7036 RMD160 45e7f69b4788c44cb1ed3b78ab453f0cc03ec764 SHA1 2a8483592edd1ee3c6fec7bef0c138094a0ad5fa SHA256 429b95023e4021a0c0608df92f421ea70ad9927c8878f39c8aa9e688d4a6628a
+EBUILD awesome-3.1-r1.ebuild 2165 RMD160 7d6cd279abf72135291312c180a690aada39c0b8 SHA1 e66be4401ef01864c9dc565556ead72fa136705e SHA256 0da6fd2bcd837ec7708dfcebf53b9ac3f9661982bc632fd0ca3b6d77b73ac77d
+MISC ChangeLog 7174 RMD160 2774e7a07189c3080076e68f59d3140deae0104f SHA1 86178337a81471a969215876e85016f2194ed54e SHA256 ac44bd3b9ccfcff8463613173ce6d4b3ab8027946e33acde32c3e14898d00a3a
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-3.1-r1.ebuild b/x11-wm/awesome/awesome-3.1-r1.ebuild
index 2d8983e25d08..f396c3c55f83 100644
--- a/x11-wm/awesome/awesome-3.1-r1.ebuild
+++ b/x11-wm/awesome/awesome-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/12/21 23:53:01 matsuu Exp $
+# $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/_/-}"
@@ -25,7 +25,7 @@ RDEPEND=">=dev-lang/lua-5.1
 	x11-libs/cairo[xcb]
 	x11-libs/libX11[xcb]
 	>=x11-libs/libxcb-1.1
-	x11-libs/pango
+	>=x11-libs/pango-1.19.3
 	>=x11-libs/xcb-util-0.3
 	media-libs/imlib2
 	dbus? ( >=sys-apps/dbus-1 )"
diff --git a/x11-wm/awesome/awesome-3.1.ebuild b/x11-wm/awesome/awesome-3.1.ebuild
deleted file mode 100644
index 4dd37da6c098..000000000000
--- a/x11-wm/awesome/awesome-3.1.ebuild
+++ /dev/null
@@ -1,98 +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.ebuild,v 1.1 2008/12/13 03:17:59 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
-	>=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
-		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
-}