Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre4-r1

9 files changed, 62 insertions, 132 deletions

diff --git a/media-gfx/xpaint/ChangeLog b/media-gfx/xpaint/ChangeLog
index e04cbf0d4a48..8eb5c939ca54 100644
--- a/media-gfx/xpaint/ChangeLog
+++ b/media-gfx/xpaint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xpaint
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.12 2005/07/30 03:10:16 vanquirius Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.13 2006/02/04 09:51:53 nelchael Exp $
+
+  04 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/Local.config-2.6.2.diff, -xpaint-2.6.2-r1.ebuild,
+  -xpaint-2.6.9.ebuild, xpaint-2.7.0.ebuild, xpaint-2.7.7.ebuild:
+  Fixed DEPEND for modular X.
 
 *xpaint-2.7.7 (30 Jul 2005)
 
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 0b0f37218612..6a9eec97d4de 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,12 +1,21 @@
-MD5 534b9691669912b8235ddf00e104154a xpaint-2.6.2-r1.ebuild 895
-MD5 728a0a103ea49a0fc6838cfd89fdd66f xpaint-2.7.0.ebuild 1464
-MD5 1671c54c16cb8c22422283dbe56c88e3 xpaint-2.6.9.ebuild 1298
-MD5 6384d97f6278f3ab61cc9eae41ede09d xpaint-2.7.7.ebuild 817
-MD5 c6d7d4db958ec15fc8e5827338508249 ChangeLog 1628
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 cc2d31e2b0dd3d23351d9a7083e30438 files/xpaint-2.7.0.patch 3104
-MD5 a5a84ca3757c5b7c1c548fcc6e4fa4d2 files/digest-xpaint-2.6.9 65
+MD5 189349c609879ac91ad9794cafe9cd9a ChangeLog 1835
+RMD160 c7b0ceca0a888cb63ffe96f8e6ed80c961503349 ChangeLog 1835
+SHA256 443db1e93b7882dac3a4cf4a77d6e229e3a472c0d31a9b0e0e8bf254de266cc3 ChangeLog 1835
 MD5 3c20cc0f202977da7d96cadc7557b9d2 files/digest-xpaint-2.7.0 65
+RMD160 e9244346dd6227252b073982149c00bd483d4d89 files/digest-xpaint-2.7.0 65
+SHA256 0550b6ea139da47e3b303ba4a994ebd9077fcaae7da144e6b2156af4fc97978f files/digest-xpaint-2.7.0 65
 MD5 8cda772b1da25f82a766f1a53d9d7267 files/digest-xpaint-2.7.7 65
-MD5 4302427d27ae29264bde31507e3a7122 files/digest-xpaint-2.6.2-r1 64
-MD5 9e9f3e735d4ceda26c1ab79a710edd05 files/Local.config-2.6.2.diff 622
+RMD160 dc060ff9f273ea2467fd6c381761e017f93afac3 files/digest-xpaint-2.7.7 65
+SHA256 f932fa988598beedc34e434756791bead7bbc2a0084dbeab1f3661cff9c00e25 files/digest-xpaint-2.7.7 65
+MD5 cc2d31e2b0dd3d23351d9a7083e30438 files/xpaint-2.7.0.patch 3104
+RMD160 3702c1f02e88a04101f68bc22f1fa6ab50409924 files/xpaint-2.7.0.patch 3104
+SHA256 9053a8b7158df23036769bff5fa3e37023bebc2461d2fe0490a38ea088f47097 files/xpaint-2.7.0.patch 3104
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+MD5 5905c6c4eb7343b9aa2d90047bde6392 xpaint-2.7.0.ebuild 1717
+RMD160 50e98ef295acd62f3486245973c790bf49d25a27 xpaint-2.7.0.ebuild 1717
+SHA256 68b6969a384088f7232b134769b893105636ce3300db38e2e89665e280634a08 xpaint-2.7.0.ebuild 1717
+MD5 1947888f963b25e9e39ed6af430c8abe xpaint-2.7.7.ebuild 1065
+RMD160 0d43c52e67831260b8017508234faa07559fe1a5 xpaint-2.7.7.ebuild 1065
+SHA256 7b6ea1828ee2e703fc2e0a80acf261759eefdc4f1bf40892f0ce07d64fe21382 xpaint-2.7.7.ebuild 1065
diff --git a/media-gfx/xpaint/files/Local.config-2.6.2.diff b/media-gfx/xpaint/files/Local.config-2.6.2.diff
deleted file mode 100644
index 2fbc50ca264a..000000000000
--- a/media-gfx/xpaint/files/Local.config-2.6.2.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-*** Local.config.orig	Wed Jan 16 21:04:42 2002
---- Local.config	Wed Jan 16 21:18:22 2002
-***************
-*** 117,124 ****
-  XCOMM Uncomment these lines and tailor to taste, if you don't like
-  XCOMM the default paths and man page extension.
-  XCOMM
-! XCOMM BINDIR = /usr/local/bin
-! XCOMM MANDIR = /usr/local/man
-  XCOMM #undef ManSuffix
-  XCOMM #define ManSuffix 1
-  
---- 117,124 ----
-  XCOMM Uncomment these lines and tailor to taste, if you don't like
-  XCOMM the default paths and man page extension.
-  XCOMM
-! BINDIR = /usr/bin
-! MANDIR = /usr/share/man/man1
-  XCOMM #undef ManSuffix
-  XCOMM #define ManSuffix 1
-  
-
-
diff --git a/media-gfx/xpaint/files/digest-xpaint-2.6.2-r1 b/media-gfx/xpaint/files/digest-xpaint-2.6.2-r1
deleted file mode 100644
index 60175c84d1cd..000000000000
--- a/media-gfx/xpaint/files/digest-xpaint-2.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f22460f15a189721573d88454ce3d41 xpaint-2.6.2.tar.gz 265319
diff --git a/media-gfx/xpaint/files/digest-xpaint-2.6.9 b/media-gfx/xpaint/files/digest-xpaint-2.6.9
deleted file mode 100644
index e09bc52009c2..000000000000
--- a/media-gfx/xpaint/files/digest-xpaint-2.6.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74818c986feb79a9bf5d8b82d329fdd4 xpaint-2.6.9.tar.bz2 522233
diff --git a/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild
deleted file mode 100644
index 3b659e258868..000000000000
--- a/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.6.2-r1.ebuild,v 1.9 2004/07/14 18:33:55 agriffis Exp $
-
-S=${WORKDIR}/xpaint
-DESCRIPTION="XPaint is an image editor which supports most standard paint program options."
-SRC_URI="http://home.worldonline.dk/~torsten/xpaint/${P}.tar.gz"
-HOMEPAGE="http://home.worldonline.dk/~torsten/xpaint/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=media-libs/tiff-3.2
-	virtual/x11
-	media-libs/jpeg
-	media-libs/libpng"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/Local.config-2.6.2.diff
-}
-
-src_compile() {
-	xmkmf || die
-	make Makefiles || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install.man || die
-	dodoc ChangeLog INSTALL README README.PNG README.old TODO
-}
diff --git a/media-gfx/xpaint/xpaint-2.6.9.ebuild b/media-gfx/xpaint/xpaint-2.6.9.ebuild
deleted file mode 100644
index 0d18d17a69fa..000000000000
--- a/media-gfx/xpaint/xpaint-2.6.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.6.9.ebuild,v 1.7 2004/07/14 18:33:55 agriffis Exp $
-
-DESCRIPTION="XPaint is an image editor which supports most standard paint program options."
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=media-libs/tiff-3.2
-	virtual/x11
-	media-libs/jpeg
-	media-libs/libpng"
-
-src_compile() {
-	xmkmf -a || die
-	# It demands Xaw95 libs now even if the docs
-	# say somthing else (own version is included)
-	make xaw95static || die
-}
-
-src_install() {
-	# make install causes tons of sanbox violations
-	# even if it uses DESTDIR so we do it the hard way
-
-	insinto /etc/X11/app-defaults
-	doins app-defaults/out/*
-
-	dobin xpaint
-
-	insinto /usr/share/xpaint/help
-	doins share/help/*
-	insinto /usr/share/xpaint/messages
-	doins share/messages/*
-	insinto /usr/share/xpaint/filters
-	doins share/filters/*
-	insinto /usr/share/xpaint/include
-	doins image.h
-
-	insinto /usr/share/pixmaps
-	doins XPaintIcon.xpm
-
-	newman xpaint._man xpaint.1
-
-	dodoc ChangeLog INSTALL README README.PNG README.old TODO \
-	      Doc/Operator.doc Doc/sample.Xdefaults
-}
diff --git a/media-gfx/xpaint/xpaint-2.7.0.ebuild b/media-gfx/xpaint/xpaint-2.7.0.ebuild
index 03644de5bdcd..722278d3f28c 100644
--- a/media-gfx/xpaint/xpaint-2.7.0.ebuild
+++ b/media-gfx/xpaint/xpaint-2.7.0.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/media-gfx/xpaint/xpaint-2.7.0.ebuild,v 1.10 2005/07/25 11:17:04 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.7.0.ebuild,v 1.11 2006/02/04 09:51:53 nelchael Exp $
 
 inherit eutils
 
@@ -13,8 +13,22 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND=">=media-libs/tiff-3.2
-	virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXp
+		!Xaw3d? ( x11-libs/libXaw ) )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-misc/gccmakedep
+		app-text/rman )
+	virtual/x11 )
+	>=media-libs/tiff-3.2
 	media-libs/jpeg
 	media-libs/libpng
 	sys-libs/zlib
diff --git a/media-gfx/xpaint/xpaint-2.7.7.ebuild b/media-gfx/xpaint/xpaint-2.7.7.ebuild
index 27b8fff12bf7..6e0ec2b71091 100644
--- a/media-gfx/xpaint/xpaint-2.7.7.ebuild
+++ b/media-gfx/xpaint/xpaint-2.7.7.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/media-gfx/xpaint/xpaint-2.7.7.ebuild,v 1.1 2005/07/30 03:10:16 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.7.7.ebuild,v 1.2 2006/02/04 09:51:53 nelchael Exp $
 
 inherit eutils
 
@@ -12,8 +12,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="Xaw3d"
 
-DEPEND=">=media-libs/tiff-3.2
-	virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXp
+		!Xaw3d? ( x11-libs/libXaw ) )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-misc/imake
+		x11-misc/gccmakedep
+		app-text/rman )
+	virtual/x11 )
+	>=media-libs/tiff-3.2
 	media-libs/jpeg
 	media-libs/libpng
 	sys-libs/zlib