5 files changed, 7 insertions, 133 deletions
diff --git a/x11-misc/xdotool/ChangeLog b/x11-misc/xdotool/ChangeLog
index a282defc8894..65d469b8dcc7 100644
--- a/x11-misc/xdotool/ChangeLog
+++ b/x11-misc/xdotool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xdotool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/ChangeLog,v 1.15 2010/09/22 17:54:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/ChangeLog,v 1.16 2010/09/22 18:00:54 joker Exp $
+
+  22 Sep 2010; Christian Birchinger <joker@gentoo.org>
+  -xdotool-20090609.ebuild, -xdotool-20091231.02.ebuild,
+  -files/xdotool-20091231.02_as-needed.patch,
+  -files/xdotool-20091231.02_install-D.patch:
+  Remove old version. This also solves the version madness.
 
   22 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   xdotool-1.20100318.2737.ebuild:
diff --git a/x11-misc/xdotool/files/xdotool-20091231.02_as-needed.patch b/x11-misc/xdotool/files/xdotool-20091231.02_as-needed.patch
deleted file mode 100644
index 50293d76b828..000000000000
--- a/x11-misc/xdotool/files/xdotool-20091231.02_as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xdotool-20091231.02.orig/Makefile xdotool-20091231.02/Makefile
---- xdotool-20091231.02.orig/Makefile	2010-01-01 04:28:54.000000000 +0100
-+++ xdotool-20091231.02/Makefile	2010-01-14 05:57:52.000000000 +0100
-@@ -63,7 +63,7 @@
- xdotool.c: xdo.h
- 
- libxdo.so: xdo.o
--	$(CC) $(LDFLAGS) -shared -Wl,-soname=libxdo.so.$(MINOR) $< -o $@
-+	$(CC) -shared -Wl,-soname=libxdo.so.$(MINOR) $< -o $@ $(LDFLAGS)
- 
- xdotool: xdotool.o libxdo.so
- 	$(CC) -o $@ xdotool.o -L. -lxdo $(LDFLAGS) 
diff --git a/x11-misc/xdotool/files/xdotool-20091231.02_install-D.patch b/x11-misc/xdotool/files/xdotool-20091231.02_install-D.patch
deleted file mode 100644
index deaf7699c093..000000000000
--- a/x11-misc/xdotool/files/xdotool-20091231.02_install-D.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ruN xdotool-20091231.02.orig/Makefile xdotool-20091231.02/Makefile
---- xdotool-20091231.02.orig/Makefile	2010-01-01 04:28:54.000000000 +0100
-+++ xdotool-20091231.02/Makefile	2010-01-14 05:53:51.000000000 +0100
-@@ -29,19 +29,17 @@
- install: installlib installprog installman installheader
- 
- installprog: xdotool
--	install -m 755 xdotool $(INSTALLBIN)/
-+	install -D -m 755 xdotool $(INSTALLBIN)/xdotool
- 
- installlib: libxdo.so
--	install libxdo.so $(INSTALLLIB)/libxdo.so.$(MINOR)
-+	install -D libxdo.so $(INSTALLLIB)/libxdo.so.$(MINOR)
- 	ln -sf libxdo.so.$(MINOR) $(INSTALLLIB)/libxdo.so
- 
- installheader: xdo.h
--	install xdo.h $(INSTALLINCLUDE)/xdo.h
-+	install -D xdo.h $(INSTALLINCLUDE)/xdo.h
- 
- installman: xdotool.1
--	[ -d $(INSTALLMAN) ] || mkdir $(INSTALLMAN)
--	[ -d $(INSTALLMAN)/man1 ] || mkdir $(INSTALLMAN)/man1
--	install -m 644 xdotool.1 $(INSTALLMAN)/man1/
-+	install -D -m 644 xdotool.1 $(INSTALLMAN)/man1/xdotool.1
- 
- deinstall: uninstall
- uninstall: 
diff --git a/x11-misc/xdotool/xdotool-20090609.ebuild b/x11-misc/xdotool/xdotool-20090609.ebuild
deleted file mode 100644
index 8b0c2ba749c2..000000000000
--- a/x11-misc/xdotool/xdotool-20090609.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/xdotool-20090609.ebuild,v 1.5 2010/07/21 15:17:45 ssuominen Exp $
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows."
-HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
-SRC_URI="http://semicomplete.googlecode.com/files/${P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="x11-libs/libXtst
-	x11-libs/libX11"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:^CFLAGS=.*:CFLAGS=-std=c99 ${CFLAGS}:" \
-		-e "s:^LIBS=.*:LIBS=$(pkg-config --libs x11 xtst):" \
-		-e "s:^INC=.*:INC=$(pkg-config --cflags x11 xtst):" \
-		-e "s:\$(CC):$(tc-getCC):" \
-		-e 's:LDFLAGS+=$(LIBS)::' \
-		-e 's:-o $@:$(LIBS) -o $@:' \
-		-e "s:\$(CFLAGS):\$(INC) \$(CFLAGS):" \
-		Makefile \
-		|| die "sed Makefile failed."
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc CHANGELIST README
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/x11-misc/xdotool/xdotool-20091231.02.ebuild b/x11-misc/xdotool/xdotool-20091231.02.ebuild
deleted file mode 100644
index f03d2d2f2f5c..000000000000
--- a/x11-misc/xdotool/xdotool-20091231.02.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/xdotool-20091231.02.ebuild,v 1.6 2010/05/23 20:01:35 pacho Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows."
-HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
-SRC_URI="http://semicomplete.googlecode.com/files/${P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="x11-libs/libXtst
-	x11-libs/libX11"
-
-RDEPEND="${DEPEND}"
-
-# The test want to manualy start Xvfb an wont use VirtualX and
-# it tries to run a full gnome-session. For such a tiny application
-# i consider it overkill to rewrite the test scripts to not use it's
-# own X server and add a full blown gnome just to run the tests.
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_install-D.patch" \
-		"${FILESDIR}/${P}_as-needed.patch"
-}
-
-src_compile() {
-	tc-export CC LD
-	# Seems to handle LDFLAGS fine without it and prevents QA message bug #312729
-	#export LDFLAGS="$(raw-ldflags)"
-	default
-	emake libxdo.so || die "Unable to build libxdo.so"
-}
-
-src_install() {
-	emake PREFIX="${D}usr" INSTALLMAN="${D}usr/share/man" INSTALLLIB="${D}usr/$(get_libdir)" install || die
-
-	dodoc CHANGELIST README
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}