Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 63 insertions, 11 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index a38365354045..179b1f1f16b8 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/aspectj
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.28 2013/09/16 17:56:23 ercpe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.29 2014/01/25 04:56:04 radhermit Exp $
+
+*aspectj-1.7.4 (25 Jan 2014)
+
+  25 Jan 2014; Tim Harder <radhermit@gentoo.org> +aspectj-1.7.4.ebuild:
+  Version bump.
 
 *aspectj-1.7.3-r1 (16 Sep 2013)
 
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 88650edb1be2..cf753038f2ad 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST aspectj-1.7.3.jar 7565941 SHA256 02a3ddde559417483bddb40dc59442f441fa5ef0aafa54b26b862727c930d6cb SHA512 2297a11638c6519b50e1938341914c68c2841c7b7894081f3157ef3463fb29519d833d274e24b8da1203a7866b2e1296d67e0872dbaa2dd835b5520f5c0a7a71 WHIRLPOOL 39242d437a55da1bfb27703b7bf920c0836893b39aa4fe412c4fe96945835a5315f89cf26a478cf33dc8a99bedbe8dff5f59e03deb5fe3e337ec932d8c54ee3f
+DIST aspectj-1.7.4-src.jar 7570114 SHA256 75270a8f5f87e14c42a251441d62e31d05f85df2ed155e0036f36f10b6ae286d SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf WHIRLPOOL 60688f65026eec16098ec077a84f0d7884287e0c7e465ad50796cf42c3724b5d6ee2d9d58e68baac66bb86b81a08581e0143bd60f5d74e04d40e04bb140bf219
 EBUILD aspectj-1.7.3-r1.ebuild 1359 SHA256 5fa6ce7128459b96382f00db100c59a02cbc52c3d0459dda7000f2f717321c4b SHA512 767c28fff50e08a689fc3f8f05fb79902f1f053794fd414af6f5fd51e1ecbd5bbc56839b548a402288dd06e54121f575518c5cf2eab95086f5975064a99c1719 WHIRLPOOL 73271a251d57267be63c772b6f50d9a0260e90a7e9ec8a7d8cf4ae804ad1708ce86480094c13df82659bfc94b0b3b83396892a419a773d2d73a152dbcc191093
-MISC ChangeLog 745 SHA256 fa91cb63abfc02d9ede001cb047c57f91867380136b712332b55468e6729a4cf SHA512 222be8b3637a05be845cf847282bc48bff302499183ccacfd69cab44842273de5ffb9e2f58db4734ef04715dc0413b9ed63dbcecfb23353e5ef42febc404663e WHIRLPOOL c8d566b1584573294e759d11ad633eb56412fe423ee4f679a2a3eba2273cfd9f0f1c3c26e995884622677722edea1014de22f282992401946dbaf0d26fa61cd4
+EBUILD aspectj-1.7.4.ebuild 1350 SHA256 be31546354d2082d932cd41e1a0ff0adc90e1985865b02c9333ba168f17f83d8 SHA512 896516a2fc7d797b7216a50dc31ad9c7554bd49c6f9bf853678774a173685e04f2964f63d417b401df47fa48b0dbc1828a0caf2046280aa6baa437b856d8b86e WHIRLPOOL 7b4b6481fcc8db3ec011190ccbf1cb879d76b77873b458e4e022e20d3f38fd51df3fb09b42d452d6fbc91782cf5d75439649b46ecd88b1f0dd0ad197fea06136
+MISC ChangeLog 868 SHA256 6869eb27c06292bec55fab16477856f47127031bf77886b2950c13f5e3372a25 SHA512 3fc2ab17ae166b1eb58908a0ecc08234a41567a4467a744dbaebb14823cba9ff671ff09acf354c19ded77dea1595f51a7c1b101d293a6d6f28ae6e0984249f6b WHIRLPOOL cb21012f56a429a64180f82e0cd33b300efdb08d4b9aeb9027c94e6e13a8d0eb6d763f72f3e2a08c75eed1ede92d8ce19a41e1fc9effcdbd6391f1ab8957e95a
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSN0ZIAAoJEKCEBkJ3xQHtvgsH/3+8e9Shto/39id4txSF7cvW
-markx8xlQpQa6X4ljhjVVzF43IlUqSxnF8sqoBCeLWjXQ9cbPIzddoYgFkZ6gixG
-cH2YRncDMxfuLqiGQPQiNI8kW2OYJnWe94R5a4fvatPDiAnxG6kliIn5nSdjaH6Y
-pxC3XfFNVim/fCvzum4YFKMBGzKvwbm3t4BgEaZ/QQOGNRoeUTulGepi+KGKNg/n
-ObOwneFslGnuWsyrF7sPENkj4bXVYgFphq4fMetni+hqcqTRpmKjiBZJgHJLx9Yd
-VRTzFUhCyLBf/wUitPgCFFLjCtODow/auSX0k5ovrzCm6BGKGTQPKr3hF035LUI=
-=tBCD
+iQEcBAEBCAAGBQJS40PoAAoJEEqz6FtPBkyjekMIAJJEFwd7Ibuw8zqgJa/7ShP2
+ORxFGDdKz9IHkGssLxRMX2s1P8/XfGrkHLxNZYwDo3JqtnEI1hj4zR8jZC4T2oRr
+jHZb9x2DKe61o5BWyNrxnBe2/Qlycd609fQN5w7yt0q6EjrOaTKpa1o4FTKLvfH8
+gxXmux1F1s4fe82DxClbv3VbmGxZ6krYypYSpmf+ouDHq55hEHfYmQWoty4I/7dd
+ZAFUvjg7nTsTUMKEzrzoPwSDtYDUQbpZ6lUSpsOqIeIbegPqkCbi45fLxMvaMkaE
+LBEYGnFIQ/3s/faX9RpcbpJpudRcjeg2vPu8xq5h3BUXDLh8ILQRWwzTZzOpFxM=
+=OK+7
 -----END PGP SIGNATURE-----
diff --git a/dev-java/aspectj/aspectj-1.7.4.ebuild b/dev-java/aspectj/aspectj-1.7.4.ebuild
new file mode 100644
index 000000000000..bdd366312fdd
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.7.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.7.4.ebuild,v 1.1 2014/01/25 04:56:04 radhermit Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
+HOMEPAGE="http://eclipse.org/aspectj/"
+SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:4
+	dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+	app-arch/zip
+	>=virtual/jdk-1.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S=${WORKDIR}
+
+JAVA_SRC_DIR="${S}/src"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
+
+src_unpack() {
+	default
+	unzip "${S}"/aspectjweaver${PV}-src.jar -d "${S}"/src/ || die
+}
+
+java_prepare() {
+	default
+
+	# needs part of BEA JRockit to compile
+	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
+	# aspectj uses a renamed version of asm:4
+	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
+	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
+	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
+}