Cleanup old and revbump

(Portage version: 2.0.54-r2)

11 files changed, 83 insertions, 103 deletions

diff --git a/dev-libs/vdk/ChangeLog b/dev-libs/vdk/ChangeLog
index c1388fbf35d1..fee659e6fd2c 100644
--- a/dev-libs/vdk/ChangeLog
+++ b/dev-libs/vdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/vdk
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/ChangeLog,v 1.18 2005/10/07 18:01:45 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/ChangeLog,v 1.19 2006/05/29 19:31:39 gustavoz Exp $
+
+*vdk-2.4.1 (29 May 2006)
+
+  29 May 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  -files/vdk-2.0.2-makefile.in.patch, -files/vdk-2.4.0-gcc3.4.patch,
+  +files/vdk-2.4-gcc3.4.patch, -vdk-2.0.2.ebuild, -vdk-2.0.2-r1.ebuild,
+  vdk-2.4.0.ebuild, +vdk-2.4.1.ebuild:
+  Cleanup old and revbump
 
   07 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> vdk-2.0.2.ebuild,
   vdk-2.0.2-r1.ebuild, vdk-2.4.0.ebuild:
diff --git a/dev-libs/vdk/Manifest b/dev-libs/vdk/Manifest
index 45b6967c45bf..194c191b1e9e 100644
--- a/dev-libs/vdk/Manifest
+++ b/dev-libs/vdk/Manifest
@@ -1,10 +1,7 @@
-MD5 895626dc5ab88262db2aee227d0cff1b ChangeLog 2004
-MD5 99848ddbdb27f9085a04d4be864953c8 files/digest-vdk-2.0.2 61
-MD5 99848ddbdb27f9085a04d4be864953c8 files/digest-vdk-2.0.2-r1 61
+MD5 095665e41ecfab0395ed7c79bc1a0abd ChangeLog 2291
 MD5 8bbcc0a70a6e499bd8539275f40e574a files/digest-vdk-2.4.0 62
-MD5 ce2f3ecb79a589ce3ac4bbd88f7bc2fd files/vdk-2.0.2-makefile.in.patch 445
-MD5 c3617790721213fc5725772e45f7b02b files/vdk-2.4.0-gcc3.4.patch 4695
+MD5 b64e64fcf7ea1c72741ce8e08c0c88c0 files/digest-vdk-2.4.1 62
+MD5 c3617790721213fc5725772e45f7b02b files/vdk-2.4-gcc3.4.patch 4695
 MD5 4947ebb6ec8d86caf11db3b648b545b4 metadata.xml 226
-MD5 4a527db2d05c9bf231c37d74659d3a6e vdk-2.0.2-r1.ebuild 895
-MD5 d533868ee4aa505bbbf773c7bb453f2b vdk-2.0.2.ebuild 868
-MD5 7c524f9ad350d9efa89e02cf6945eca4 vdk-2.4.0.ebuild 1648
+MD5 b5277bc6b3a73548357e25a4584dc334 vdk-2.4.0.ebuild 1663
+MD5 34026c711c5681e4fdb211086cd2521d vdk-2.4.1.ebuild 1570
diff --git a/dev-libs/vdk/files/digest-vdk-2.0.2 b/dev-libs/vdk/files/digest-vdk-2.0.2
deleted file mode 100644
index 66f80f8d5c24..000000000000
--- a/dev-libs/vdk/files/digest-vdk-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed312dbb897056c39a299c944710f4df vdk-2.0.2.tar.gz 920055
diff --git a/dev-libs/vdk/files/digest-vdk-2.0.2-r1 b/dev-libs/vdk/files/digest-vdk-2.0.2-r1
deleted file mode 100644
index 66f80f8d5c24..000000000000
--- a/dev-libs/vdk/files/digest-vdk-2.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed312dbb897056c39a299c944710f4df vdk-2.0.2.tar.gz 920055
diff --git a/dev-libs/vdk/files/digest-vdk-2.4.1 b/dev-libs/vdk/files/digest-vdk-2.4.1
new file mode 100644
index 000000000000..c437bce179b7
--- /dev/null
+++ b/dev-libs/vdk/files/digest-vdk-2.4.1
@@ -0,0 +1 @@
+MD5 f388bf265a476880e98ddec7ac4e63f7 vdk-2.4.1.tar.gz 1062475
diff --git a/dev-libs/vdk/files/vdk-2.0.2-makefile.in.patch b/dev-libs/vdk/files/vdk-2.0.2-makefile.in.patch
deleted file mode 100644
index c9f77122c083..000000000000
--- a/dev-libs/vdk/files/vdk-2.0.2-makefile.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vdk/Makefile.in.orig	2003-01-15 14:04:55.000000000 -0500
-+++ vdk/Makefile.in	2003-01-15 14:05:05.000000000 -0500
-@@ -183,8 +183,8 @@
- INCLUDES = -I$(top_srcdir)/include @INCLUDES@
- CXXFLAGS = @CXXFLAGS@
- 
--LDFLAGS = "$(GTK_CFLAGS) $(SIGC_CFLAGS)"
--LIBS = "$(GTK_LIBS) $(SIGC_LIBS)"
-+LDFLAGS = $(GTK_CFLAGS) $(SIGC_CFLAGS)
-+LIBS = $(GTK_LIBS) $(SIGC_LIBS)
- 
- EXTRA_DIST =  	rgb.cc 	sigc_events.cc 	sigc_eventsignals.cc 	sigc_eventtraits.cc
- 
diff --git a/dev-libs/vdk/files/vdk-2.4.0-gcc3.4.patch b/dev-libs/vdk/files/vdk-2.4-gcc3.4.patch
index b8a7ef3c3ce8..b8a7ef3c3ce8 100644
--- a/dev-libs/vdk/files/vdk-2.4.0-gcc3.4.patch
+++ b/dev-libs/vdk/files/vdk-2.4-gcc3.4.patch
diff --git a/dev-libs/vdk/vdk-2.0.2-r1.ebuild b/dev-libs/vdk/vdk-2.0.2-r1.ebuild
deleted file mode 100644
index 9d727a1c0767..000000000000
--- a/dev-libs/vdk/vdk-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.0.2-r1.ebuild,v 1.5 2005/10/07 18:01:45 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="The Visual Development Kit used by VDK Builder"
-SRC_URI="mirror://sourceforge/vdkbuilder/${P}.tar.gz"
-HOMEPAGE="http://vdkbuilder.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc alpha ~sparc ~hppa"
-IUSE="nls gnome"
-
-DEPEND="dev-libs/atk
-	x11-libs/pango
-	dev-libs/glib
-	dev-util/pkgconfig
-	>=x11-libs/gtk+-2.0.3
-	gnome? ( gnome-base/libgnome )"
-#	app-doc/doxygen"
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-makefile.in.patch
-
-	econf \
-		`use_enable nls` \
-		`use_enable gnome` \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO
-}
diff --git a/dev-libs/vdk/vdk-2.0.2.ebuild b/dev-libs/vdk/vdk-2.0.2.ebuild
deleted file mode 100644
index 81b13b0dc577..000000000000
--- a/dev-libs/vdk/vdk-2.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.0.2.ebuild,v 1.9 2005/10/07 18:01:45 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="The Visual Development Kit used by VDK Builder"
-SRC_URI="mirror://sourceforge/vdkbuilder/${P}.tar.gz"
-HOMEPAGE="http://vdkbuilder.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="nls gnome"
-
-DEPEND="dev-libs/atk
-	x11-libs/pango
-	dev-libs/glib
-	dev-util/pkgconfig
-	>=x11-libs/gtk+-2.0.3
-	gnome? ( gnome-base/libgnome )"
-#	app-doc/doxygen"
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-makefile.in.patch
-
-	econf \
-		`use_enable nls` \
-		`use_enable gnome` \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO
-}
diff --git a/dev-libs/vdk/vdk-2.4.0.ebuild b/dev-libs/vdk/vdk-2.4.0.ebuild
index c12aec6e11ac..926b8d8414e1 100644
--- a/dev-libs/vdk/vdk-2.4.0.ebuild
+++ b/dev-libs/vdk/vdk-2.4.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.0.ebuild,v 1.9 2005/10/07 18:01:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.0.ebuild,v 1.10 2006/05/29 19:31:39 gustavoz Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A Visual Development Kit for RAD"
 SRC_URI="mirror://sourceforge/vdkbuilder/${P}.tar.gz"
-HOMEPAGE="http://vdk.sourceforge.net/"
+HOMEPAGE="http://http://www.mariomotta.it/vdklib/"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -24,7 +24,7 @@ src_compile() {
 
 	if [ "$(gcc-major-version)" -ge "4" ] || [ "$(gcc-major-version)" -ge "3" -a "$(gcc-minor-version)" -ge "4" ]
 	then
-		epatch ${FILESDIR}/${P}-gcc3.4.patch
+		epatch ${FILESDIR}/vdk-2.4-gcc3.4.patch
 	fi
 
 	# gnome and sigc USE flags need to be added later
diff --git a/dev-libs/vdk/vdk-2.4.1.ebuild b/dev-libs/vdk/vdk-2.4.1.ebuild
new file mode 100644
index 000000000000..e150f0091f06
--- /dev/null
+++ b/dev-libs/vdk/vdk-2.4.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vdk/vdk-2.4.1.ebuild,v 1.1 2006/05/29 19:31:39 gustavoz Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Visual Development Kit for RAD"
+SRC_URI="mirror://sourceforge/vdklib/${P}.tar.gz"
+HOMEPAGE="http://http://www.mariomotta.it/vdklib/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~hppa ~ppc ~sparc ~x86"
+IUSE="doc debug"
+
+DEPEND=">x11-libs/gtk+-2.4
+	doc? ( app-doc/doxygen )"
+
+src_compile() {
+
+	cd ${S}
+
+	local myconf=""
+
+	if [ "$(gcc-major-version)" -ge "4" ] || [ "$(gcc-major-version)" -ge "3" -a
+	"$(gcc-minor-version)" -ge "4" ]
+	then
+		epatch ${FILESDIR}/vdk-2.4-gcc3.4.patch
+	fi
+
+	# gnome and sigc USE flags need to be added later
+	# when upstream decides to re-support them - ChrisWhite
+
+	use doc && \
+		myconf="${myconf} --enable-doc-html=yes \
+						  --enable-doc-latex=yes \
+						  --enable-doc-man=yes" \
+		|| myconf="${myconf} --enable-doc-html=no \
+							 --enable-doc-latex=no \
+							 --enable-doc-man=no"
+
+	use debug && \
+		myconf="${myconf} --enable-debug=yes" \
+		|| myconf="${myconf} --enable-debug=no"
+
+	econf \
+		${myconf} \
+		--enable-testvdk=no \
+		|| die "econf failed"
+
+		# die non user custom CFLAGS!
+		sed -e "s/CFLAGS = .*/CFLAGS = ${CFLAGS}/" -i Makefile
+		sed -e "s/CXXFLAGS = .*/CXXFLAGS = ${CXXFLAGS}/" -i Makefile
+		sed -e "s/CFLAGS = .*/CFLAGS = ${CFLAGS}/" -i vdk/Makefile
+		sed -e "s/CXXFLAGS = .*/CXXFLAGS = ${CXXFLAGS}/" -i vdk/Makefile
+
+		emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
+}