Fixing deps for modular X, cleaning up.

(Portage version: 2.0.53)

6 files changed, 24 insertions, 51 deletions

diff --git a/sci-electronics/pcb/ChangeLog b/sci-electronics/pcb/ChangeLog
index bbf0d7c60214..6aff40879e01 100644
--- a/sci-electronics/pcb/ChangeLog
+++ b/sci-electronics/pcb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/pcb
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.16 2005/11/14 20:10:39 plasmaroo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.17 2006/01/25 17:04:16 phosphan Exp $
+
+  25 Jan 2006; Patrick Kursawe <phosphan@gentoo.org> -pcb-20050127.ebuild,
+  pcb-20050315.ebuild, pcb-20050609.ebuild:
+  Fixing deps for modular X, cleaning up.
 
 *pcb-20050609 (14 Nov 2005)
 
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 97852a362dd4..3d5392dc304c 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,8 +1,6 @@
 MD5 ef6f638c2228f525f586bd824bc19e14 ChangeLog 3629
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 bce3b71d52d36f2cc22bc892d8eae9fd pcb-20050127.ebuild 855
-MD5 3263be39d5fd8a3fe8aa412e0d65438a pcb-20050315.ebuild 855
-MD5 6831341b7f54408490eb4dd7bcb2d12b pcb-20050609.ebuild 775
-MD5 88e4c82ca9e4e75500fce40fa49f1ac7 files/digest-pcb-20050127 65
 MD5 b871b8033ae2d914a901d136d99a0a5d files/digest-pcb-20050315 65
 MD5 f7492ac97a1d9c03476cc32ba994073e files/digest-pcb-20050609 65
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 df8749645ca51e1f0bfedfd17f5cb3d9 pcb-20050315.ebuild 933
+MD5 fb439dff9b4091dad988f38fb11accc0 pcb-20050609.ebuild 807
diff --git a/sci-electronics/pcb/files/digest-pcb-20050127 b/sci-electronics/pcb/files/digest-pcb-20050127
deleted file mode 100644
index 0ca40c8dc172..000000000000
--- a/sci-electronics/pcb/files/digest-pcb-20050127
+++ /dev/null
@@ -1 +0,0 @@
-MD5 752e79c4797f5a900e492f2f0c42c15e pcb-20050127.tar.gz 2324200
diff --git a/sci-electronics/pcb/pcb-20050127.ebuild b/sci-electronics/pcb/pcb-20050127.ebuild
deleted file mode 100644
index cce7054310f0..000000000000
--- a/sci-electronics/pcb/pcb-20050127.ebuild
+++ /dev/null
@@ -1,36 +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/pcb/pcb-20050127.ebuild,v 1.6 2005/05/17 18:17:27 hansmi Exp $
-
-DESCRIPTION="tool for the layout of printed circuit boards"
-HOMEPAGE="http://pcb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pcb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="Xaw3d"
-
-RDEPEND="virtual/x11"
-DEPEND="${RDEPEND}
-	=dev-lang/tk-8*"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's/\(^START-INFO\)/INFO-DIR-SECTION Miscellaneous\n\1/' doc/pcb.info
-}
-
-src_compile() {
-	local myconf=""
-	use Xaw3d \
-		&& myconf="--with-xaw=Xaw3d" \
-		|| myconf="--with-xaw=Xaw"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sci-electronics/pcb/pcb-20050315.ebuild b/sci-electronics/pcb/pcb-20050315.ebuild
index 43a04ffa9cef..0ece76dd194d 100644
--- a/sci-electronics/pcb/pcb-20050315.ebuild
+++ b/sci-electronics/pcb/pcb-20050315.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/pcb/pcb-20050315.ebuild,v 1.4 2005/08/13 23:36:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20050315.ebuild,v 1.5 2006/01/25 17:04:16 phosphan Exp $
 
 DESCRIPTION="tool for the layout of printed circuit boards"
 HOMEPAGE="http://pcb.sourceforge.net/"
@@ -11,8 +11,13 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE="Xaw3d"
 
-RDEPEND="virtual/x11"
+RDEPEND=">=x11-libs/gtk+-2.4
+		 Xaw3d? x11-libs/Xaw3d"
 DEPEND="${RDEPEND}
+	|| (
+		virtual/x11
+		x11-proto/xproto
+	   )
 	=dev-lang/tk-8*"
 
 src_unpack() {
diff --git a/sci-electronics/pcb/pcb-20050609.ebuild b/sci-electronics/pcb/pcb-20050609.ebuild
index 7a2d289d669e..84b3bfaaf319 100644
--- a/sci-electronics/pcb/pcb-20050609.ebuild
+++ b/sci-electronics/pcb/pcb-20050609.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/pcb/pcb-20050609.ebuild,v 1.1 2005/11/14 20:10:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20050609.ebuild,v 1.2 2006/01/25 17:04:16 phosphan Exp $
 
 DESCRIPTION="tool for the layout of printed circuit boards"
 HOMEPAGE="http://pcb.sourceforge.net/"
@@ -11,10 +11,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="virtual/x11"
+RDEPEND=">=x11-libs/gtk+-2.4"
 DEPEND="${RDEPEND}
 	=dev-lang/tk-8*
-	>=x11-libs/gtk+-2.4"
+	|| (
+		virtual/x11
+		x11-proto/xproto
+	   )"
 
 src_unpack() {
 	unpack ${A}