fixed bug #19394

7 files changed, 55 insertions, 80 deletions

diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index 60e78ba73722..d6c8af1910ab 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvclock
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.5 2003/04/09 21:30:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.6 2003/04/16 02:44:03 malverian Exp $
+
+*nvclock-0.6.2-r1 (15 Apr 2003)
+
+  15 Apr 2003; Philip Walls <malverian@gentoo.org> nvclock-0.6.2-r1.ebuild :
+  Moved into stable, removed 0.5 ebuild: see #19394
+  Thanks to Trans13nt for fixed ebuild/testing
 
 *nvclock-0.6.2 (10 Feb 2003)
 
diff --git a/media-video/nvclock/Manifest b/media-video/nvclock/Manifest
index 75bb7823ffa7..fbe5cfc51799 100644
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -1,5 +1,5 @@
-MD5 7c7f6df7f585a5753a769ceb36632d6b ChangeLog 1280
-MD5 624b1b2ad847f53732aa504523e80d76 nvclock-0.6.2-r1.ebuild 1245
+MD5 896e837c52a651c820e6a0c87f1853be ChangeLog 1282
+MD5 6cc2438061cc7212e3a2eda659869c4d nvclock-0.6.2-r1.ebuild 1245
 MD5 f67b707dada0b65403208150063ae2c8 files/0.6.2-configure.in.patch 1169
 MD5 4cb45c458284815823717e4a8dbd0e60 files/0.6.2-qt-version-check.patch 516
 MD5 97349e83a1718eab21d4b1959b7e6bed files/digest-nvclock-0.6.2-r1 63
diff --git a/media-video/nvclock/files/digest-nvclock-0.5 b/media-video/nvclock/files/digest-nvclock-0.5
deleted file mode 100644
index 9b2bcc316134..000000000000
--- a/media-video/nvclock/files/digest-nvclock-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e07a89284702c515039f5ec22ec0a37 nvclock0.5.tar.gz 70432
diff --git a/media-video/nvclock/files/digest-nvclock-0.6.2 b/media-video/nvclock/files/digest-nvclock-0.6.2-r1
index 53bf20fb3795..53bf20fb3795 100644
--- a/media-video/nvclock/files/digest-nvclock-0.6.2
+++ b/media-video/nvclock/files/digest-nvclock-0.6.2-r1
diff --git a/media-video/nvclock/nvclock-0.5.ebuild b/media-video/nvclock/nvclock-0.5.ebuild
deleted file mode 100644
index 0a47f33f4672..000000000000
--- a/media-video/nvclock/nvclock-0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /space/gentoo/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.4.2.ebuild,v 1.3 2002/05/23 06:50:14 seemant Exp
-
-IUSE="gtk qt"
-
-S=${WORKDIR}/${PN}${PV}
-SRC_URI="http://www.evil3d.net/download/${PN}/${PN}${PV}.tar.gz"
-DESCRIPTION="NVIDIA overclocking utility"
-HOMEPAGE="http://www.evil3d.net/products/nvclock/"
-
-RDEPEND="virtual/glibc
-	gtk? ( virtual/x11 =x11-libs/gtk+-1.2* )
-	qt? ( virtual/x11 x11-libs/qt )"
-DEPEND="$RDEPEND sys-devel/autoconf"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-	local myconf
-	use gtk && myconf="--enable-gtk"
-	use qt && myconf="${myconf} --enable-qt"
-	autoconf
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install	
-	dodoc AUTHORS COPYING README	
-}
diff --git a/media-video/nvclock/nvclock-0.6.2-r1.ebuild b/media-video/nvclock/nvclock-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..ace52d0ceeda
--- /dev/null
+++ b/media-video/nvclock/nvclock-0.6.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.                                                                                         
+# Distributed under the terms of the GNU General Public License v2                                                                      
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.6.2-r1.ebuild,v 1.1 2003/04/16 02:44:03 malverian Exp $                     
+
+IUSE="gtk qt"
+
+MY_P="${PN}${PV}"
+S=${WORKDIR}/${PN}${PV}
+SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
+DESCRIPTION="NVIDIA Overclocking Utility"
+HOMEPAGE="http://www.linuxhardware.org/nvclock/"
+
+DEPEND="virtual/glibc
+	sys-devel/autoconf
+	gtk? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( =x11-libs/gtk+-2* )
+	qt? ( x11-libs/qt )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+src_compile() {
+	epatch ${FILESDIR}/${PV}-configure.in.patch
+	use qt && epatch ${FILESDIR}/${PV}-qt-version-check.patch
+
+	autoconf || die
+
+	export QTDIR=/usr/qt/3
+
+	local myconf
+
+	[ -z "`use gtk``use gtk2`" ] \
+		&& myconf="${myconf} --disable-gtk" \
+		|| myconf="${myconf} --enable-gtk"
+
+	use qt && myconf="${myconf} --enable-qt"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr install
+	dodoc AUTHORS COPYING README
+}
diff --git a/media-video/nvclock/nvclock-0.6.2.ebuild b/media-video/nvclock/nvclock-0.6.2.ebuild
deleted file mode 100644
index b835dd17c881..000000000000
--- a/media-video/nvclock/nvclock-0.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.6.2.ebuild,v 1.2 2003/02/13 13:31:24 vapier Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV}"
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
-DESCRIPTION="NVIDIA overclocking utility"
-HOMEPAGE="http://www.linuxhardware.org/nvclock/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="gtk gtk2 qt"
-
-DEPEND="virtual/glibc
-	|| (
-		gtk2? ( virtual/x11 =x11-libs/gtk+-2* )
-		gtk? ( virtual/x11 =x11-libs/gtk+-1* )
-	)
-	qt? ( virtual/x11 =x11-libs/qt-3* )"
-DEPEND="${RDEPEND} sys-devel/autoconf"
-
-src_compile() {
-	epatch ${FILESDIR}/${PV}-configure.in.patch
-	epatch ${FILESDIR}/${PV}-qt-version-check.patch
-	autoconf || die
-
-	export QTDIR=/usr/qt/3
-	local myconf="`use_enable qt`"
-	[ -z "`use gtk``use gtk2`" ] \
-		&& myconf="${myconf} --disable-gtk" \
-		|| myconf="${myconf} --enable-gtk"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install
-	dodoc AUTHORS COPYING README ABOUT ChangeLog FAQ NEWS INSTALL
-}