Add fix by Petteri Räty for java handling #362323.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 122 insertions, 8 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index c22e50eff488..390b3ae05523 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.151 2010/05/31 19:20:31 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.152 2011/04/08 18:02:51 vapier Exp $
+
+*automake-1.11.1-r1 (08 Apr 2011)
+
+  08 Apr 2011; Mike Frysinger <vapier@gentoo.org> +automake-1.11.1-r1.ebuild,
+  +files/automake-1.11.1-check-java.patch:
+  Add fix by Petteri Räty for java handling #362323.
 
   31 May 2010; Joseph Jezak <josejx@gentoo.org> automake-1.11.1.ebuild:
   Marked ppc64 stable for bug #295947.
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 770dfeccccc7..bcae431cb766 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX automake-1.10-ccnoco-ldflags.patch 901 RMD160 6b85133540877b082c4dfdd2fb378c66293bea64 SHA1 8aaa601cc4efe9cc294708d572ed34de9d5ea529 SHA256 98c85d873eac326a4b6c6afde25d887da85a45bae4bb4fad853a40e46fba7af5
 AUX automake-1.10.1-tests.patch 3283 RMD160 6ddc6524fa2e26f96dabb3062fb926d4ad9a08d2 SHA1 0f2616f5fa9eca0f6caf79539809391c9de8e146 SHA256 107f073536a7104d5b25dc7ff80933c22f44f847789435f5678c01090890506b
 AUX automake-1.10.2-bash4.patch 644 RMD160 5ab94e24f620ba2817fa1d227308cf3cb5c34f5b SHA1 43d2a5bd5ac0f32c5d0cb57433263b9bdfe76a09 SHA256 c07951416ab13e34d5090892cbba5e4d0e6e351fef1ee540d11b0da88d6ea677
+AUX automake-1.11.1-check-java.patch 495 RMD160 6590bdaa9558be689a49f4b7a96c6cdf0c4272fd SHA1 11198f1a57e25977006d2ffe1debff93b74b926a SHA256 7660d083da2d2c039a5bdf01ca5259787c949d6f892489a0d046bc1abf42e79d
 AUX automake-1.4-CVE-2009-4029.patch 2186 RMD160 091ae4f33c7d709c259090054d8cf19c117cb2ae SHA1 0b963afd899c52493ab620a358b83ff3716e5067 SHA256 29a556dee26b3081ecfc5b04eda8c3e5430a3e48a37f156ffc54b1d2132d9275
 AUX automake-1.4-ansi2knr-stdlib.patch 249 RMD160 f17983551ea326df6dc03f8389c02df3670eb475 SHA1 f6f23af88bde758dcc6893c01c98adb502a4c1e1 SHA256 8a29de01493b888f392388a0cffc0e4e2c0f4d81bc2ff34a4b65d27fab804210
 AUX automake-1.4-libtoolize.patch 542 RMD160 8ae18870f6b6f934b5f3d0440bb472c54f4f0bfb SHA1 90d41bbb160578142b540638a99426d9440c6c13 SHA256 1620b99a3043c66d6e6ae8a369733a1042ff5deec08ab11c727dea15032a684b
@@ -34,6 +35,7 @@ DIST automake-1.7.9.tar.bz2 577705 RMD160 d967c0dd5bf4a8430d6b598660a98e71588695
 DIST automake-1.8.5.tar.bz2 663182 RMD160 36892a845b189d81593e4b1146352c391c4affac SHA1 b639ff48033e9ac7347a6f938b015107754fdf3a SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410
 DIST automake-1.9.6.tar.bz2 765505 RMD160 ad93e095056f41f0369ac6a06fed3904d8e3514f SHA1 d205dbb274d3ff5be1cf6734f27fb452c7131866 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d
 EBUILD automake-1.10.3.ebuild 1649 RMD160 fdb53a0a0beb8ad56613ab41d7c8e3ad13c98e96 SHA1 4c0a62a508d5b55c23b3f78adcdb907913468b27 SHA256 428c39340366c8976dc826cc0535472ed190e846e1227ed580b1f505ff073b5a
+EBUILD automake-1.11.1-r1.ebuild 2238 RMD160 8a0810d00706083b9db9d318d6157f70f18bb258 SHA1 6dbd13836d852a1b68d30fcf5482644d56308cc1 SHA256 2d95f75fb380839f0ce21aba997ca46eb4b95fa95332d6c9087c8022de530025
 EBUILD automake-1.11.1.ebuild 2175 RMD160 966134e3dc8935f8603aee1826372df94eb22e6a SHA1 04c16b98c4e7b53962770bb388a0bb6e5a2bc381 SHA256 854bf5f270c8087da1417537d89ad995acf3e8b183958ea8c5a19c779a76b933
 EBUILD automake-1.4_p6-r1.ebuild 1812 RMD160 f1d32186c2b07a03c42daa6fcb271b8c475bee4c SHA1 20cd946155b0d2985d40e94ea99f057fb44ef0b1 SHA256 3b2dd6b62465e4b21ecbc5ad252308714616f47211a66f619e01fc4f341a260e
 EBUILD automake-1.5-r1.ebuild 1769 RMD160 a514d4c30f866c65748aa527491a742c7c92152f SHA1 acda339e3d9ea14e9e6abbb0ca94fa28f68d4b3e SHA256 d00b382aaa6037851cf10f0133620c7a144d55a45e1ba15d84cf7638afec386c
@@ -42,12 +44,12 @@ EBUILD automake-1.7.9-r2.ebuild 1671 RMD160 3f507f67705c00bc78ae430b07d8afe33314
 EBUILD automake-1.8.5-r4.ebuild 1688 RMD160 1d52217f4cd225c1b734b407fdec80cda3b0323d SHA1 a98e99e77f10b9c4bdd1671cd34c6e7d354c016e SHA256 070b98552be58187a62aa40794d94420686a7bbaed0686a85bd97621a00c8da1
 EBUILD automake-1.9.6-r3.ebuild 1911 RMD160 2a056ece008e0030160dbf5e9a7b7804cfbdbcb3 SHA1 04da5793a096d5d057227b3dbf6c555c84fc3b04 SHA256 c015ac5f4b6117c036114ad348670ffaa674d280aa5cff2b53d08e5b4caec0f4
 EBUILD automake-9999.ebuild 1486 RMD160 4e82fd03d3ccdf006d3ff1da24c9e6c49cb8991f SHA1 8d5b190a9c21aa9f311cdc39ad77477b57837d4a SHA256 010c5638f1bd10c9697b42bc08e15454b82bb186c30518c37fbe0eeca94b9ac1
-MISC ChangeLog 24601 RMD160 69de46e0fc936f28660d52e44e25a6fbb4192cad SHA1 73817b03bd8ada4c276108ed5f077ad886b8f7ab SHA256 c0da2aad019f15751b0aaf71bd7e0b30c341546f2c15976c2090f4afd8bfb269
+MISC ChangeLog 24812 RMD160 f691740f2011dd4f66da655818deaaedc4ebdf65 SHA1 771e35be9b84d1b063ace8ab15277077dd8f6216 SHA256 c922077538d7c6febaa5933b8a3f1c092bd79c968e2fe47a6ac142419d4da5db
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkwEC8wACgkQcsIHjyDViGRU6gCg01Q/s71z++uxhZfktBLj1Vr5
-6IgAoJcJJQWQXqmmDwMEoGHM780pXjVj
-=wgDw
+iF4EAREIAAYFAk2fTdEACgkQaC/OocHi7JbPvAEAkSGQse/7ccMAPGRtfhZUvnsk
+Ld1OgdPrCe31aCwRHoIA/ifmciCTzkt926mCwvH92KhIA95qkgtv+OmI1yYcA8zY
+=ZjR1
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.11.1-r1.ebuild b/sys-devel/automake/automake-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..c46b4e73e121
--- /dev/null
+++ b/sys-devel/automake/automake-1.11.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.1-r1.ebuild,v 1.1 2011/04/08 18:02:51 vapier Exp $
+
+inherit eutils versionator
+
+if [[ ${PV/_beta} == ${PV} ]]; then
+	MY_P=${P}
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+else
+	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+	MY_P="${PN}-${MY_PV}"
+
+	# Alpha/beta releases are not distributed on the usual mirrors.
+	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.bz2"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="http://sources.redhat.com/automake/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-3-r2
+	>=sys-devel/autoconf-2.62
+	>=sys-apps/texinfo-4.7
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod a+rx tests/*.test
+	sed -i \
+		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
+		doc/automake.texi || die "sed failed"
+	mv doc/automake{,${SLOT}}.texi
+	sed -i \
+		-e "s:automake.info:automake${SLOT}.info:" \
+		-e "s:automake.texi:automake${SLOT}.texi:" \
+		doc/Makefile.in || die "sed on Makefile.in failed"
+	epatch "${FILESDIR}"/${P}-check-java.patch #362323
+	export WANT_AUTOCONF=2.5
+}
+
+src_compile() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
+	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+
+	local x
+	for x in aclocal automake; do
+		help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
+
+	rm \
+		"${D}"/usr/bin/{aclocal,automake} \
+		"${D}"/usr/share/man/man1/{aclocal,automake}.1
+
+	# 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.11.1-check-java.patch b/sys-devel/automake/files/automake-1.11.1-check-java.patch
new file mode 100644
index 000000000000..861a5f6c37dc
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.11.1-check-java.patch
@@ -0,0 +1,27 @@
+should be in upstream git now
+
+https://bugs.gentoo.org/362323
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8234
+
+diff --git a/automake.in b/automake.in
+index d74730d..a8ec749 100755
+--- a/automake.in
++++ b/automake.in
+@@ -5121,8 +5121,14 @@ sub handle_java
+ 	$dir = $curs;
+       }
+ 
+-
+-    push (@all, 'class' . $dir . '.stamp');
++    if ($dir eq 'check')
++      {
++        push (@check, "class$dir.stamp");
++      }
++    else
++      {
++        push (@all, "class$dir.stamp");
++      }
+ }
+ 
+ 
+