Fix building against automake 1.13.1. Clean up patch.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 14 insertions, 41 deletions

diff --git a/x11-misc/xdock/ChangeLog b/x11-misc/xdock/ChangeLog
index 32093193e3bc..289d67ad7761 100644
--- a/x11-misc/xdock/ChangeLog
+++ b/x11-misc/xdock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdock
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdock/ChangeLog,v 1.5 2012/02/13 22:17:46 voyageur Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdock/ChangeLog,v 1.6 2013/08/25 15:34:02 jer Exp $
+
+  25 Aug 2013; Jeroen Roovers <jer@gentoo.org> -xdock-0.2.0.ebuild,
+  xdock-0.3.0.ebuild, files/xdock-0.2.0-ldconfig.patch:
+  Fix building against automake 1.13.1. Clean up patch.
 
 *xdock-0.3.0 (13 Feb 2012)
 
diff --git a/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch b/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch
index 409c6935d63d..31956ccd8362 100644
--- a/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch
+++ b/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch
@@ -1,5 +1,5 @@
---- xdock-0.2.0/src/lib/Makefile.am
-+++ xdock-0.2.0/src/lib/Makefile.am
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
 @@ -8,5 +8,3 @@
  
  include_HEADERS = xdock.h
diff --git a/x11-misc/xdock/xdock-0.2.0.ebuild b/x11-misc/xdock/xdock-0.2.0.ebuild
deleted file mode 100644
index 603b1e10ef9b..000000000000
--- a/x11-misc/xdock/xdock-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +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/xdock/xdock-0.2.0.ebuild,v 1.3 2010/10/26 12:28:16 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="emulates Window Maker docks (runs in any window manager)"
-HOMEPAGE="http://xdock.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	media-libs/imlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldconfig.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc API AUTHORS ChangeLog README TODO
-}
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0.ebuild
index 1153338e8085..835350851e7f 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdock/xdock-0.3.0.ebuild,v 1.1 2012/02/13 22:17:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdock/xdock-0.3.0.ebuild,v 1.2 2013/08/25 15:34:02 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="emulates Window Maker docks (runs in any window manager)"
@@ -17,12 +17,10 @@ IUSE=""
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
+DOCS=( API AUTHORS ChangeLog README TODO )
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc API AUTHORS ChangeLog README TODO
-}