Port to modular X; clear up stale ebuilds.

(Portage version: 2.1_pre3-r1)

8 files changed, 17 insertions, 102 deletions

diff --git a/sci-electronics/gerbv/ChangeLog b/sci-electronics/gerbv/ChangeLog
index ae7e7bfe42cf..7b4d390d0df8 100644
--- a/sci-electronics/gerbv/ChangeLog
+++ b/sci-electronics/gerbv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/gerbv
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/ChangeLog,v 1.7 2005/10/01 17:33:54 ribosome Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/ChangeLog,v 1.8 2006/01/22 15:51:29 plasmaroo Exp $
+
+  22 Jan 2006; <plasmaroo@gentoo.org> gerbv-0.15.ebuild, gerbv-0.16-r1.ebuild,
+  -gerbv-0.16.ebuild, gerbv-1.0.1-r1.ebuild, -gerbv-1.0.1.ebuild:
+  Port to modular X; clear up stale ebuilds.
 
 *gerbv-1.0.1-r1 (01 Oct 2005)
 *gerbv-0.16-r1 (01 Oct 2005)
diff --git a/sci-electronics/gerbv/files/digest-gerbv-0.16 b/sci-electronics/gerbv/files/digest-gerbv-0.16
deleted file mode 100644
index 55568ac546eb..000000000000
--- a/sci-electronics/gerbv/files/digest-gerbv-0.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7b375137cbfc8f1c1fef04493fd4a61 gerbv-0.16.tar.gz 1032058
diff --git a/sci-electronics/gerbv/files/digest-gerbv-1.0.1 b/sci-electronics/gerbv/files/digest-gerbv-1.0.1
deleted file mode 100644
index 5d895c82bb2e..000000000000
--- a/sci-electronics/gerbv/files/digest-gerbv-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e259ecec8b65b532a09b7c4ba31c8a08 gerbv-1.0.1.tar.gz 1033739
diff --git a/sci-electronics/gerbv/gerbv-0.15.ebuild b/sci-electronics/gerbv/gerbv-0.15.ebuild
index 48c4c068e1e1..b38e2f816b17 100644
--- a/sci-electronics/gerbv/gerbv-0.15.ebuild
+++ b/sci-electronics/gerbv/gerbv-0.15.ebuild
@@ -1,6 +1,6 @@
-# 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/sci-electronics/gerbv/gerbv-0.15.ebuild,v 1.3 2005/05/17 18:20:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.15.ebuild,v 1.4 2006/01/22 15:51:29 plasmaroo Exp $
 
 DESCRIPTION="gerbv - The gEDA Gerber Viewer"
 SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
@@ -11,11 +11,9 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha ppc sparc x86"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=dev-libs/glib-1.2.10
-	>=x11-libs/gtk+-1.2.10
-	media-libs/gdk-pixbuf
-	virtual/x11"
+DEPEND="dev-util/guile
+	=x11-libs/gtk+-1*
+	media-libs/gdk-pixbuf"
 
 src_compile() {
 	econf || die
diff --git a/sci-electronics/gerbv/gerbv-0.16-r1.ebuild b/sci-electronics/gerbv/gerbv-0.16-r1.ebuild
index aa48008e632e..fbbd2daa07f9 100644
--- a/sci-electronics/gerbv/gerbv-0.16-r1.ebuild
+++ b/sci-electronics/gerbv/gerbv-0.16-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/sci-electronics/gerbv/gerbv-0.16-r1.ebuild,v 1.1 2005/10/01 17:33:55 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.16-r1.ebuild,v 1.2 2006/01/22 15:51:29 plasmaroo Exp $
 
 DESCRIPTION="gerbv - The gEDA Gerber Viewer"
 SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
@@ -14,8 +14,7 @@ KEYWORDS="~x86 ~amd64"
 DEPEND=">=sys-libs/glibc-2.1.3
 	=x11-libs/gtk+-2*
 	png? ( media-libs/libpng
-		media-libs/gdk-pixbuf )
-	virtual/x11"
+		media-libs/gdk-pixbuf )"
 
 src_compile() {
 	local confOptions
diff --git a/sci-electronics/gerbv/gerbv-0.16.ebuild b/sci-electronics/gerbv/gerbv-0.16.ebuild
deleted file mode 100644
index 40e7803bef8c..000000000000
--- a/sci-electronics/gerbv/gerbv-0.16.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-0.16.ebuild,v 1.2 2005/01/02 02:01:39 plasmaroo Exp $
-
-DESCRIPTION="gerbv - The gEDA Gerber Viewer"
-SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
-HOMEPAGE="http://www.geda.seul.org"
-
-IUSE="doc gtk2 png"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	gtk2? ( =x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1* )
-	png? ( media-libs/libpng )
-	png? ( media-libs/gdk-pixbuf )
-	virtual/x11"
-
-src_compile() {
-	local confOptions
-	use gtk2 && confOptions='--enable-gtk2'
-	use png || confOptions="$confOptions --disable-exportpng"
-
-	econf $confOptions || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-	if use doc; then
-		cd doc
-		dodoc sources.txt
-		use png && dodoc PNG-print/PNGPrintMiniHowto.txt
-		docinto eagle
-		dodoc eagle/eagle2exc*
-	fi
-}
diff --git a/sci-electronics/gerbv/gerbv-1.0.1-r1.ebuild b/sci-electronics/gerbv/gerbv-1.0.1-r1.ebuild
index 77dbefbfdfcf..47b5dbdd5c0f 100644
--- a/sci-electronics/gerbv/gerbv-1.0.1-r1.ebuild
+++ b/sci-electronics/gerbv/gerbv-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/sci-electronics/gerbv/gerbv-1.0.1-r1.ebuild,v 1.1 2005/10/01 17:33:55 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-1.0.1-r1.ebuild,v 1.2 2006/01/22 15:51:29 plasmaroo Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ KEYWORDS="~x86 ~ppc"
 
 DEPEND="=x11-libs/gtk+-2*
 	png? ( media-libs/libpng
-		media-libs/gdk-pixbuf )
-	virtual/x11"
+		media-libs/gdk-pixbuf )"
 
 src_compile() {
 	local confOptions
diff --git a/sci-electronics/gerbv/gerbv-1.0.1.ebuild b/sci-electronics/gerbv/gerbv-1.0.1.ebuild
deleted file mode 100644
index 511a3007a213..000000000000
--- a/sci-electronics/gerbv/gerbv-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gerbv/gerbv-1.0.1.ebuild,v 1.1 2005/03/13 16:57:58 plasmaroo Exp $
-
-inherit eutils
-
-DESCRIPTION="gerbv - The gEDA Gerber Viewer"
-SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
-HOMEPAGE="http://www.geda.seul.org"
-
-IUSE="doc gtk2 png xinerama"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="gtk2? ( =x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1* )
-	png? ( media-libs/libpng )
-	png? ( media-libs/gdk-pixbuf )
-	virtual/x11"
-
-src_compile() {
-	local confOptions
-
-	use gtk2 && confOptions='--enable-gtk2'
-	use gtk2 && use xinerama && epatch ${FILESDIR}/${PN}-1.0.0-Xinerama.patch
-	use png || confOptions="$confOptions --disable-exportpng"
-
-	econf $confOptions || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-	if use doc; then
-		cd doc
-		dodoc sources.txt
-		use png && dodoc PNG-print/PNGPrintMiniHowto.txt
-		docinto eagle
-		dodoc eagle/eagle2exc*
-	fi
-}