Version bump and ebuild cleanups.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 91 insertions, 2 deletions

diff --git a/x11-misc/xdotool/ChangeLog b/x11-misc/xdotool/ChangeLog
index 645d44ab976c..b6d133a0e666 100644
--- a/x11-misc/xdotool/ChangeLog
+++ b/x11-misc/xdotool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xdotool
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/ChangeLog,v 1.5 2009/10/30 11:05:37 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdotool/ChangeLog,v 1.6 2010/01/14 05:32:46 joker Exp $
+
+*xdotool-20091231.02 (14 Jan 2010)
+
+  14 Jan 2010; Christian Birchinger <joker@gentoo.org>
+  +xdotool-20091231.02.ebuild, +files/xdotool-20091231.02_as-needed.patch,
+  +files/xdotool-20091231.02_install-D.patch:
+  Version bump and ebuild cleanups.
 
   30 Oct 2009; Markus Meier <maekke@gentoo.org> xdotool-20090609.ebuild:
   amd64/x86 stable, bug #289978
diff --git a/x11-misc/xdotool/files/xdotool-20091231.02_as-needed.patch b/x11-misc/xdotool/files/xdotool-20091231.02_as-needed.patch
new file mode 100644
index 000000000000..50293d76b828
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-20091231.02_as-needed.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..deaf7699c093
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-20091231.02_install-D.patch
@@ -0,0 +1,27 @@
+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-20091231.02.ebuild b/x11-misc/xdotool/xdotool-20091231.02.ebuild
new file mode 100644
index 000000000000..d7cb8b3b2b1f
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-20091231.02.ebuild
@@ -0,0 +1,43 @@
+# 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.1 2010/01/14 05:32:46 joker 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="~x86 ~amd64"
+IUSE="examples"
+
+DEPEND="x11-libs/libXtst
+	x11-libs/libX11"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_install-D.patch" \
+		"${FILESDIR}/${P}_as-needed.patch"
+}
+
+src_compile() {
+	tc-export CC LD
+	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
+}