amd64 stable

(Portage version: 2.1.4.4)

5 files changed, 13 insertions, 56 deletions

diff --git a/app-misc/clockywock/ChangeLog b/app-misc/clockywock/ChangeLog
index cf3b17ccd00f..9e757d9b063f 100644
--- a/app-misc/clockywock/ChangeLog
+++ b/app-misc/clockywock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/clockywock
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/clockywock/ChangeLog,v 1.4 2007/07/19 21:28:51 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/clockywock/ChangeLog,v 1.5 2008/02/14 15:35:35 drac Exp $
+
+  14 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -files/clockywock-0.2.2-cxxflags.patch,
+  -files/clockywock-0.2.2-headers.patch, -clockywock-0.2.2.ebuild,
+  clockywock-0.2.3.ebuild:
+  amd64 stable
 
 *clockywock-0.2.3 (19 Jul 2007)
 
diff --git a/app-misc/clockywock/clockywock-0.2.2.ebuild b/app-misc/clockywock/clockywock-0.2.2.ebuild
deleted file mode 100644
index f9400fd01a12..000000000000
--- a/app-misc/clockywock/clockywock-0.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/clockywock/clockywock-0.2.2.ebuild,v 1.2 2006/11/19 01:34:20 tcort Exp $
-
-inherit eutils
-
-DESCRIPTION="ncurses analog clock"
-HOMEPAGE="http://www.soomka.com/"
-SRC_URI="http://www.soomka.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-# probably not needed since ncurses is in 'system', but I like to be pedantic
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${P}-cxxflags.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-}
-
-src_install() {
-	dobin clockywock
-	dodoc README
-}
diff --git a/app-misc/clockywock/clockywock-0.2.3.ebuild b/app-misc/clockywock/clockywock-0.2.3.ebuild
index 001136b2beb6..99f0ee5422e5 100644
--- a/app-misc/clockywock/clockywock-0.2.3.ebuild
+++ b/app-misc/clockywock/clockywock-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/clockywock/clockywock-0.2.3.ebuild,v 1.2 2007/07/19 21:32:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/clockywock/clockywock-0.2.3.ebuild,v 1.3 2008/02/14 15:35:35 drac Exp $
 
 inherit toolchain-funcs
 
@@ -10,17 +10,17 @@ SRC_URI="http://www.soomka.com/${P}.tar.gz"
 
 LICENSE="GPL-2 as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	$(tc-getCXX) ${CXXFLAGS} -Wall -o clockywock clockywock.cpp -lncurses -lpthread || die "build failed."
+	$(tc-getCXX) ${CXXFLAGS} -Wall -o ${PN} ${PN}.cpp -lncurses -lpthread || die "build failed."
 }
 
 src_install() {
-	dobin clockywock
+	dobin ${PN}
 	dodoc README
 }
diff --git a/app-misc/clockywock/files/clockywock-0.2.2-cxxflags.patch b/app-misc/clockywock/files/clockywock-0.2.2-cxxflags.patch
deleted file mode 100644
index 01ed1950671e..000000000000
--- a/app-misc/clockywock/files/clockywock-0.2.2-cxxflags.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -urN clockywock-0.2.2.orig/Makefile clockywock-0.2.2/Makefile
---- clockywock-0.2.2.orig/Makefile	2006-06-07 22:45:42.000000000 -0400
-+++ clockywock-0.2.2/Makefile	2006-06-07 22:46:10.000000000 -0400
-@@ -1,2 +1,2 @@
- all:
--	g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread
-+	${CXX} ${CXXFLAGS} -o clockywock clockywock.cpp -lncurses -lpthread
diff --git a/app-misc/clockywock/files/clockywock-0.2.2-headers.patch b/app-misc/clockywock/files/clockywock-0.2.2-headers.patch
deleted file mode 100644
index 8d069dc5172e..000000000000
--- a/app-misc/clockywock/files/clockywock-0.2.2-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN clockywock-0.2.2.orig/clockywock.cpp clockywock-0.2.2/clockywock.cpp
---- clockywock-0.2.2.orig/clockywock.cpp	2006-06-07 22:45:42.000000000 -0400
-+++ clockywock-0.2.2/clockywock.cpp	2006-06-07 22:49:34.000000000 -0400
-@@ -5,7 +5,7 @@
- #include <getopt.h>
- #include <string.h>
- #include <ctype.h>
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>