add missing pkgconfig dep (bug #205839) and remove old

(Portage version: 2.1.4)

8 files changed, 11 insertions, 279 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index 2e2e774ea4ef..7b9375ae0778 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/k3d
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.34 2007/08/31 18:46:45 lu_zero Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.35 2008/01/15 00:28:58 maekke Exp $
+
+  15 Jan 2008; Markus Meier <maekke@gentoo.org>
+  -files/k3d-0.5.0.34-nls.patch, -files/k3d-0.5.0.37-nls.patch,
+  -k3d-0.5.0.37-r1.ebuild, -k3d-0.6.2.0.ebuild, k3d-0.6.7.0.ebuild:
+  add missing pkgconfig dep (bug #205839) and remove old
 
 *k3d-0.6.7.0 (31 Aug 2007)
 
diff --git a/media-gfx/k3d/files/digest-k3d-0.5.0.37-r1 b/media-gfx/k3d/files/digest-k3d-0.5.0.37-r1
deleted file mode 100644
index 72a3dbaae4a5..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.5.0.37-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e0d26d4867c2f07e25060e295818e21 k3d-0.5.0.37.tar.bz2 4518681
-RMD160 f8c690c5816bf71a892fd380b4ba53fa83b709e6 k3d-0.5.0.37.tar.bz2 4518681
-SHA256 7206ea1c14e6b6c2ed70e7b746394de47554e74bab572bde06924fc07f169516 k3d-0.5.0.37.tar.bz2 4518681
diff --git a/media-gfx/k3d/files/digest-k3d-0.6.2.0 b/media-gfx/k3d/files/digest-k3d-0.6.2.0
deleted file mode 100644
index e75d02c070a5..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.6.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a896cb31a0077805654ef8485f410e5c k3d-0.6.2.0-src.tar.bz2 5328923
-RMD160 a3a2f0736d1e852c54819e91f20e4563a0d9bf21 k3d-0.6.2.0-src.tar.bz2 5328923
-SHA256 5544a7f51203a731864ac51f43815d1985bcfd0f2a4e3b96cc2205fe8910d11d k3d-0.6.2.0-src.tar.bz2 5328923
diff --git a/media-gfx/k3d/files/k3d-0.5.0.34-nls.patch b/media-gfx/k3d/files/k3d-0.5.0.34-nls.patch
deleted file mode 100644
index 129fcc69123a..000000000000
--- a/media-gfx/k3d/files/k3d-0.5.0.34-nls.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: k3d-0.5.0.34/application/main.cpp
-===================================================================
---- k3d-0.5.0.34.orig/application/main.cpp
-+++ k3d-0.5.0.34/application/main.cpp
-@@ -688,10 +688,12 @@ int main(int argc, char* argv[])
- {
- 	const std::string program_name = boost::filesystem::path(argv[0], boost::filesystem::native).leaf();
- 
-+#ifdef ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(PACKAGE, K3D_LOCALE);
- 	bind_textdomain_codeset(PACKAGE, "UTF-8");
- 	textdomain(PACKAGE);
-+#endif
- 
- 	logbufs_t logbufs;
- 
-Index: k3d-0.5.0.34/bug-buddy/main.cpp
-===================================================================
---- k3d-0.5.0.34.orig/bug-buddy/main.cpp
-+++ k3d-0.5.0.34/bug-buddy/main.cpp
-@@ -533,10 +533,12 @@ int main(int argc, char* argv[])
- {
- 	const std::string program_name = boost::filesystem::path(argv[0], boost::filesystem::native).leaf();
- 
-+#ifdef ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(PACKAGE, K3D_LOCALE);
- 	bind_textdomain_codeset(PACKAGE, "UTF-8");
- 	textdomain(PACKAGE);
-+#endif
- 
- 	Gtk::Main main(&argc, &argv);
- 
-Index: k3d-0.5.0.34/k3dsdk/i18n.h
-===================================================================
---- k3d-0.5.0.34.orig/k3dsdk/i18n.h
-+++ k3d-0.5.0.34/k3dsdk/i18n.h
-@@ -23,12 +23,6 @@
- 
- 	#define _(String) (String)
- 	#define N_(String) (String)
--	#define textdomain(String) 
--	#define gettext(String) (String)
--	#define dgettext(Domain, String) (String)
--	#define dcgettext(Domain, String, Type) (String)
--	#define bindtextdomain(Domain, Directory) 
--	#define bind_textdomain_codeset(Domain, Codeset) 
- 
- #endif // !ENABLE_NLS
diff --git a/media-gfx/k3d/files/k3d-0.5.0.37-nls.patch b/media-gfx/k3d/files/k3d-0.5.0.37-nls.patch
deleted file mode 100644
index f5ae33fdbb0c..000000000000
--- a/media-gfx/k3d/files/k3d-0.5.0.37-nls.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --exclude='*~' -Naur k3d-0.5.0.37.orig/application/main.cpp k3d-0.5.0.37/application/main.cpp
---- k3d-0.5.0.37.orig/application/main.cpp	2006-02-02 17:22:31.000000000 -0200
-+++ k3d-0.5.0.37/application/main.cpp	2006-02-02 17:23:20.000000000 -0200
-@@ -685,10 +685,12 @@
- {
- 	const std::string program_name = boost::filesystem::path(argv[0], boost::filesystem::native).leaf();
- 
-+#ifdef ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(PACKAGE, K3D_LOCALE);
- 	bind_textdomain_codeset(PACKAGE, "UTF-8");
- 	textdomain(PACKAGE);
-+#endif
- 
- 	logbufs_t logbufs;
- 
-diff --exclude='*~' -Naur k3d-0.5.0.37.orig/bug-buddy/main.cpp k3d-0.5.0.37/bug-buddy/main.cpp
---- k3d-0.5.0.37.orig/bug-buddy/main.cpp	2006-02-02 17:22:34.000000000 -0200
-+++ k3d-0.5.0.37/bug-buddy/main.cpp	2006-02-02 17:23:58.000000000 -0200
-@@ -532,10 +532,12 @@
- {
- 	const std::string program_name = boost::filesystem::path(argv[0], boost::filesystem::native).leaf();
- 
-+#ifdef ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(PACKAGE, K3D_LOCALE);
- 	bind_textdomain_codeset(PACKAGE, "UTF-8");
- 	textdomain(PACKAGE);
-+#endif
- 
- 	Gtk::Main main(&argc, &argv);
- 
-diff --exclude='*~' -Naur k3d-0.5.0.37.orig/k3dsdk/i18n.h k3d-0.5.0.37/k3dsdk/i18n.h
---- k3d-0.5.0.37.orig/k3dsdk/i18n.h	2006-02-02 17:22:33.000000000 -0200
-+++ k3d-0.5.0.37/k3dsdk/i18n.h	2006-02-02 17:24:50.000000000 -0200
-@@ -23,12 +23,6 @@
- 
- 	#define _(String) (String)
- 	#define N_(String) (String)
--	#define textdomain(String) 
--	#define gettext(String) (String)
--	#define dgettext(Domain, String) (String)
--	#define dcgettext(Domain, String, Type) (String)
--	#define bindtextdomain(Domain, Directory) 
--	#define bind_textdomain_codeset(Domain, Codeset) 
- 
- #endif // !ENABLE_NLS 
- 
diff --git a/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild b/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild
deleted file mode 100644
index 4c3dcec72f7b..000000000000
--- a/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild,v 1.5 2007/07/22 09:55:45 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="A free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://www.k-3d.org/"
-SRC_URI="mirror://sourceforge/k3d/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="expat gnome graphviz imagemagick jpeg nls openexr plib png python svg tiff truetype xml"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( dev-libs/expat )
-	truetype? ( >=media-libs/freetype-2 )
-	gnome? ( gnome-base/libgnome )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	dev-cpp/glibmm
-	dev-cpp/gtkmm
-	>=x11-libs/gtkglext-1.0.6-r3
-	openexr? ( media-libs/openexr )
-	plib? ( media-libs/plib )
-	png? ( media-libs/libpng )
-	python? ( >=dev-lang/python-2.3 )
-	tiff? ( media-libs/tiff )
-	=dev-libs/libsigc++-2.0*
-	gnome-base/librsvg"
-
-RDEPEND="${DEPEND}
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM"
-
-DEPEND="${DEPEND}
-	media-libs/mesa"
-
-src_unpack() {
-	unpack ${A}
-	# bug 112144
-	epatch "${FILESDIR}"/${PN}-0.5.0.37-nls.patch
-}
-
-src_compile() {
-	local myconf="--with-ngui"
-	if use expat || ! use xml ; then
-		myconf="--without-libxml2"
-	else
-		myconf="--with-libxml2"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--with-external-boost \
-		$(use_with truetype freetype2) \
-		$(use_with gnome) \
-		$(use_with graphviz) \
-		$(use_with imagemagick) \
-		$(use_with jpeg) \
-		$(use_with openexr) \
-		$(use_with plib) \
-		$(use_with png) \
-		$(use_with python) \
-		$(use_with svg svg-icons) \
-		$(use_with tiff) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO
-	#missing dir
-	dodir /usr/share/k3d/shaders/layered
-	keepdir /usr/share/k3d/shaders/layered
-}
diff --git a/media-gfx/k3d/k3d-0.6.2.0.ebuild b/media-gfx/k3d/k3d-0.6.2.0.ebuild
deleted file mode 100644
index 18ba3a7ba94c..000000000000
--- a/media-gfx/k3d/k3d-0.6.2.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.6.2.0.ebuild,v 1.4 2007/07/22 09:55:45 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="A free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://www.k-3d.org/"
-SRC_URI="mirror://sourceforge/k3d/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="expat gnome graphviz imagemagick jpeg nls openexr plib png python svg tiff truetype xml"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	xml? ( dev-libs/libxml2 )
-	!xml? ( dev-libs/expat )
-	truetype? ( >=media-libs/freetype-2 )
-	gnome? ( gnome-base/libgnome )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	>=dev-cpp/glibmm-2.6
-	>=dev-cpp/gtkmm-2.6
-	>=x11-libs/gtkglext-1.0.6-r3
-	openexr? ( media-libs/openexr )
-	plib? ( media-libs/plib )
-	png? ( media-libs/libpng )
-	python? ( >=dev-lang/python-2.3 )
-	tiff? ( media-libs/tiff )
-	=dev-libs/libsigc++-2.0*
-	gnome-base/librsvg"
-
-RDEPEND="${DEPEND}
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM"
-
-DEPEND="${DEPEND}
-	media-libs/mesa"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	local myconf="--with-ngui"
-	if use expat || ! use xml ; then
-		myconf="--without-libxml2"
-	else
-		myconf="--with-libxml2"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--with-external-boost \
-		$(use_with truetype freetype2) \
-		$(use_with gnome) \
-		$(use_with graphviz) \
-		$(use_with imagemagick) \
-		$(use_with jpeg) \
-		$(use_with openexr) \
-		$(use_with plib) \
-		$(use_with png) \
-		$(use_with python) \
-		$(use_with svg svg-icons) \
-		$(use_with tiff) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO
-	#missing dir
-	dodir /usr/share/k3d/shaders/layered
-	keepdir /usr/share/k3d/shaders/layered
-}
diff --git a/media-gfx/k3d/k3d-0.6.7.0.ebuild b/media-gfx/k3d/k3d-0.6.7.0.ebuild
index bae8e2f016ed..2795339404a9 100644
--- a/media-gfx/k3d/k3d-0.6.7.0.ebuild
+++ b/media-gfx/k3d/k3d-0.6.7.0.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/media-gfx/k3d/k3d-0.6.7.0.ebuild,v 1.1 2007/08/31 18:46:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.6.7.0.ebuild,v 1.2 2008/01/15 00:28:58 maekke Exp $
 
 inherit eutils
 
@@ -42,7 +42,8 @@ RDEPEND="${DEPEND}
 	x11-libs/libSM"
 
 DEPEND="${DEPEND}
-	media-libs/mesa"
+	media-libs/mesa
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}