Version bumped.

(Portage version: 2.1.3.19)

6 files changed, 16 insertions, 59 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 71035f826762..c73010fe7c9a 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.6 2007/11/19 18:30:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.7 2007/12/11 14:16:32 matsuu Exp $
+
+*awesome-2.0 (11 Dec 2007)
+
+  11 Dec 2007; MATSUU Takuto <matsuu@gentoo.org> -awesome-1.2.ebuild,
+  -awesome-2.0_rc1.ebuild, +awesome-2.0.ebuild:
+  Version bumped.
+  Removed old versions.
 
   19 Nov 2007; Markus Rothe <corsair@gentoo.org> awesome-2.0_rc1.ebuild:
   Added ~ppc64
diff --git a/x11-wm/awesome/awesome-1.2.ebuild b/x11-wm/awesome/awesome-1.2.ebuild
deleted file mode 100644
index 5c60a28480a3..000000000000
--- a/x11-wm/awesome/awesome-1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-1.2.ebuild,v 1.3 2007/09/30 14:42:03 matsuu Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="awesome is a window manager initialy based on a dwm code rewriting"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libconfig
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xineramaproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "/^CFLAGS/s:=.*-O3:= ${CFLAGS}:" \
-		-e "/^LDFLAGS/s:-ggdb3:${LDFLAGS}:" \
-		-e "/^CC/s:cc:$(tc-getCC):" \
-		-e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local:/usr:" \
-		config.mk || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	dodoc AUTHORS README awesomerc
-}
diff --git a/x11-wm/awesome/awesome-2.0_rc1.ebuild b/x11-wm/awesome/awesome-2.0.ebuild
index 2d403f1acf29..3405cbc94733 100644
--- a/x11-wm/awesome/awesome-2.0_rc1.ebuild
+++ b/x11-wm/awesome/awesome-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.0_rc1.ebuild,v 1.2 2007/11/19 18:30:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.0.ebuild,v 1.1 2007/12/11 14:16:32 matsuu Exp $
 
 inherit toolchain-funcs
 
@@ -23,6 +23,8 @@ RDEPEND="dev-libs/confuse
 	x11-libs/libXinerama"
 
 DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
 	dev-util/pkgconfig
 	x11-proto/xineramaproto"
 
@@ -35,7 +37,7 @@ src_unpack() {
 
 	sed -i \
 		-e "/^CFLAGS/s:=.*-O3:= ${CFLAGS}:" \
-		-e "/^LDFLAGS/s:-ggdb3:${LDFLAGS}:" \
+		-e "/LDFLAGS/s:-ggdb3:${LDFLAGS}:" \
 		-e "/^CC/s:cc:$(tc-getCC):" \
 		-e "s:/usr/lib:/usr/$(get_libdir):" \
 		-e "s:/usr/local:/usr:" \
@@ -43,7 +45,7 @@ src_unpack() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install-unstrip || die "emake install failed"
 
 	exeinto /etc/X11/Sessions
 	newexe "${FILESDIR}"/${PN}-session ${PN}
diff --git a/x11-wm/awesome/files/digest-awesome-1.2 b/x11-wm/awesome/files/digest-awesome-1.2
deleted file mode 100644
index 229769818d6c..000000000000
--- a/x11-wm/awesome/files/digest-awesome-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 810de61609a3fabd1ce5ec745e385c57 awesome-1.2.tar.gz 39006
-RMD160 9d56858516269441bd1574432dfa25a8289f0b83 awesome-1.2.tar.gz 39006
-SHA256 44bce503a3c27a9afc4b4f508a5cb2930ca2ace0317f24f34ab543390402cf9d awesome-1.2.tar.gz 39006
diff --git a/x11-wm/awesome/files/digest-awesome-2.0 b/x11-wm/awesome/files/digest-awesome-2.0
new file mode 100644
index 000000000000..e5bcd595ebbf
--- /dev/null
+++ b/x11-wm/awesome/files/digest-awesome-2.0
@@ -0,0 +1,3 @@
+MD5 b3e245bd9b8c05b759cc0acbec9f6a29 awesome-2.0.tar.gz 48600
+RMD160 3a3a7014a11915f316bfce9ce5a2a606a057363a awesome-2.0.tar.gz 48600
+SHA256 933ce7f5f4339963a5f6229caf82c9f0fb8eb69e69293f72246737e13ffaa079 awesome-2.0.tar.gz 48600
diff --git a/x11-wm/awesome/files/digest-awesome-2.0_rc1 b/x11-wm/awesome/files/digest-awesome-2.0_rc1
deleted file mode 100644
index c3f4548c197b..000000000000
--- a/x11-wm/awesome/files/digest-awesome-2.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6bdd33b0a688b79d3491b1241a507b54 awesome-2.0-rc1.tar.gz 45714
-RMD160 0fdc9d8f2cd195b2a0a43763523afdf3e17f12cf awesome-2.0-rc1.tar.gz 45714
-SHA256 e76858a21378cca994d145976698d14300a62240d5436c0597853b63ae3e1f58 awesome-2.0-rc1.tar.gz 45714