5 files changed, 94 insertions, 7 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 07e928605106..8d21aa53bf5c 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.75 2005/07/11 04:48:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.76 2005/09/29 08:48:16 vapier Exp $
+
+*automake-1.9.6-r1 (29 Sep 2005)
+
+  29 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.9.6-include-dir-prefix.patch, +automake-1.9.6-r1.ebuild:
+  Add patch to fix rules with subdirs #107435 by John Ratliff.
 
 *automake-1.9.6 (11 Jul 2005)
 
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index f8056a5abfa5..13d58c6adfd9 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 038fd25744010b665c4f8176dc74cbc3 automake-1.9.6-r1.ebuild 1463
 MD5 c2b7648d70be8a4ab0080ed00cb796e3 automake-1.6.3.ebuild 1431
 MD5 60753f865fa023a3bcd0466250a743a7 automake-1.4_p6.ebuild 1809
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 60402cbb0e854aea08a716500d6b48b9 automake-1.9.6.ebuild 1400
-MD5 e92da70fff503e5e1ab84cdb2b42b057 automake-1.9.5.ebuild 1400
 MD5 3ad0b6b355e91b67210e8e14e81de267 automake-1.8.5-r3.ebuild 1503
 MD5 88db2f78adf73dd93c0e21a58259d2eb automake-1.5.ebuild 1696
-MD5 2bcdc60669453e3bf4004bb894344dcf ChangeLog 12544
+MD5 6fd04a53a1b2b9d7508f84336d0497c7 ChangeLog 12769
 MD5 f648af66d23f848644ae7f0e0a0fd8a9 automake-1.7.9-r1.ebuild 1506
 MD5 a1b9c06cc3ba7ac88f3b870f51d35758 files/digest-automake-1.9.6 67
 MD5 4c0ad89956f0b70972c19a60c65f9275 files/automake-1.9.3-infopage-namechange.patch 1109
 MD5 252f1212a83cc74c42cd557bc3f65e32 files/digest-automake-1.4_p6 67
 MD5 a56b2416416ab1f0bdc71cb7ab0454d6 files/automake-1.5-slot.patch 1191
+MD5 41bfebb78fd15ed76ef2ae3a7d76d726 files/automake-1.9.6-include-dir-prefix.patch 1106
 MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
 MD5 29dec70b283dffd42358d3643b1754c3 files/digest-automake-1.7.9-r1 67
 MD5 b04899a3860b0623bd45c705258ceabd files/automake-1.4-ansi2knr-stdlib.patch 249
@@ -23,14 +24,14 @@ MD5 91bfbe9a39ed2eee6bfa0254bad56d5d files/automake-1.4-libtoolize.patch 542
 MD5 a4327436d159f9262364994c88489ee6 files/automake-1.4-subdirs-89656.patch 944
 MD5 fbf3743bc8590dcb5bd34c675cb9d9f0 files/automake-1.5-target_hook.patch 1132
 MD5 a591fd70f20b40a46667f57326ad4b7c files/digest-automake-1.6.3 67
-MD5 e24b7d1101074fe4f610b71143f7f843 files/digest-automake-1.9.5 67
 MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 MD5 0fe9854b3a6384ef4c7b0bd2bad72c59 files/digest-automake-1.8.5-r3 67
+MD5 a1b9c06cc3ba7ac88f3b870f51d35758 files/digest-automake-1.9.6-r1 67
 MD5 5c2fe79f8f664efdb7e2736e88c10f09 files/automake-1.5-test-fixes.patch 2303
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDC7h2gIKl8Uu19MoRAkSAAJ0Z3oKtrRSSx4MLTtQqzGGn0V9IMQCfY2S7
-dDww4LrRfkn3qjm24dUZdvI=
-=AmkT
+iD8DBQFDO6qWgIKl8Uu19MoRAtTvAJ4ryIoTvRj/c/DTBsAHslKDdLSzewCfU082
+q/r1nVI/dc875i3eHNXopFw=
+=Q+pJ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.9.6-r1.ebuild b/sys-devel/automake/automake-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..89956a3d4b9a
--- /dev/null
+++ b/sys-devel/automake/automake-1.9.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r1.ebuild,v 1.1 2005/09/29 08:48:16 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~ppc-macos s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59-r6
+	>=sys-apps/texinfo-4.7
+	sys-devel/gnuconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^@setfilename/s|automake|automake${SLOT}|" \
+		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
+		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
+	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
+	export WANT_AUTOCONF=2.5
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	rm -f "${D}"/usr/bin/{aclocal,automake}
+
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+	doinfo doc/*.info*
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x=
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+	done
+}
diff --git a/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch
new file mode 100644
index 000000000000..a1d62a78e119
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.9.6-include-dir-prefix.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/107435
+http://lists.gnu.org/archive/html/automake/2005-09/msg00088.html
+
+2005-09-27  Stepan Kasal  <address@hidden>
+
+	* automake.in (handle_single_transform): Direct suffix rule preserves
+	  the directory prefix, so the generated object name should contain
+	  it, too.
+
+--- automake.in	2005-09-17 15:05:39.000000000 +0200
++++ automake.in	2005-09-27 17:10:47.000000000 +0200
+@@ -1755,6 +1755,10 @@
+             # This is probably the result of a direct suffix rule.
+             # In this case we just accept the rewrite.
+             $object = "$base$extension";
++            if ($directory ne '')
++            {
++                $object = $directory . '/' . $object;
++            }
+             $linker = '';
+         }
+         else
+@@ -1824,7 +1828,7 @@
+ 
+ 		# For Java, the way we're handling it right now, a
+ 		# `..' component doesn't make sense.
+-                if ($lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
++                if ($lang && $lang->name eq 'java' && $object =~ /(\/|^)\.\.\//)
+ 		  {
+ 		    err_am "`$full' should not contain a `..' component";
+ 		  }
diff --git a/sys-devel/automake/files/digest-automake-1.9.6-r1 b/sys-devel/automake/files/digest-automake-1.9.6-r1
new file mode 100644
index 000000000000..3fe57a5cad3e
--- /dev/null
+++ b/sys-devel/automake/files/digest-automake-1.9.6-r1
@@ -0,0 +1 @@
+MD5 c11b8100bb311492d8220378fd8bf9e0 automake-1.9.6.tar.bz2 765505