Fix DEPEND for modular X (bug #117110), removed old version.

(Portage version: 2.1_pre3-r1)

5 files changed, 24 insertions, 67 deletions

diff --git a/x11-misc/imwheel/ChangeLog b/x11-misc/imwheel/ChangeLog
index 6321f8944cd6..5e4ec1498e6a 100644
--- a/x11-misc/imwheel/ChangeLog
+++ b/x11-misc/imwheel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/imwheel
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/imwheel/ChangeLog,v 1.17 2005/09/17 02:02:11 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/imwheel/ChangeLog,v 1.18 2006/01/15 13:11:56 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/imwheel-1.0.0_pre2-gentoo.diff, -imwheel-1.0.0_pre11.ebuild,
+  imwheel-1.0.0_pre12.ebuild:
+  Fix DEPEND for modular X (bug #117110), removed old version.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   imwheel-1.0.0_pre12.ebuild:
diff --git a/x11-misc/imwheel/files/digest-imwheel-1.0.0_pre11 b/x11-misc/imwheel/files/digest-imwheel-1.0.0_pre11
deleted file mode 100644
index 774bf709a363..000000000000
--- a/x11-misc/imwheel/files/digest-imwheel-1.0.0_pre11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 460d30ee6c4ccc7dcabb8ddb78956ce9 imwheel-1.0.0pre11.tar.gz 202796
diff --git a/x11-misc/imwheel/files/imwheel-1.0.0_pre2-gentoo.diff b/x11-misc/imwheel/files/imwheel-1.0.0_pre2-gentoo.diff
deleted file mode 100644
index 8c486989a83d..000000000000
--- a/x11-misc/imwheel/files/imwheel-1.0.0_pre2-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN imwheel-1.0.0pre2/Makefile.in imwheel-1.0.0pre2-modified/Makefile.in
---- imwheel-1.0.0pre2/Makefile.in	2002-09-08 20:42:52.000000000 -0500
-+++ imwheel-1.0.0pre2-modified/Makefile.in	2002-11-13 00:57:36.000000000 -0600
-@@ -575,7 +575,6 @@
- 
- install-exec-am: install-binPROGRAMS
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
- install-info: install-info-recursive
- 
-@@ -645,7 +644,7 @@
- @NO_GPM_DOC_TRUE@.premake:
- @NO_GPM_DOC_TRUE@	@#Start
- @NO_GPM_DOC_TRUE@	@touch .premake
--@NO_GPM_DOC_TRUE@	@rm -f @gpm_imwheel@/doc/Makefile
-+@NO_GPM_DOC_TRUE@	@rm -f doc/Makefile
- @NO_GPM_DOC_TRUE@all: .postmake
- @NO_GPM_DOC_TRUE@distclean: .postmake
- @NO_GPM_DOC_TRUE@.postmake:
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre11.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre11.ebuild
deleted file mode 100644
index 304d7ff9e36e..000000000000
--- a/x11-misc/imwheel/imwheel-1.0.0_pre11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/imwheel/imwheel-1.0.0_pre11.ebuild,v 1.6 2004/09/02 22:49:41 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="mouse tool for advanced features such as wheels and 3+ buttons"
-HOMEPAGE="http://imwheel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/imwheel/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~amd64 ~alpha"
-
-IUSE=""
-DEPEND="virtual/x11
-	>=sys-apps/sed-4"
-S="${WORKDIR}/${P/_/}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#epatch ${FILESDIR}/${P}-gentoo.diff
-	sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die
-	sed -i -e "s:/etc:${D}/etc:g" Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-
-	# don't build gpm stuff
-	myconf="--disable-gpm --disable-gpm-doc"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog EMACS M-BA47 NEWS README TODO
-}
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
index 16d493aa8f8b..f8904b210f2d 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.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/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild,v 1.5 2005/09/17 02:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild,v 1.6 2006/01/15 13:11:56 nelchael Exp $
 
 inherit eutils
 
@@ -13,8 +13,22 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 
 IUSE=""
-DEPEND="virtual/x11
+
+RDEPEND="|| ( (
+			x11-libs/libXtst
+			x11-libs/libX11
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libXext )
+		virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )
 	>=sys-apps/sed-4"
+
 S="${WORKDIR}/${P/_/}"
 
 src_unpack() {