dev-java/netbeans-mobility: version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

3 files changed, 165 insertions, 12 deletions

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index cae85661cc05..c49662cd1149 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/netbeans-mobility
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-mobility/ChangeLog,v 1.18 2013/02/21 15:51:08 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-mobility/ChangeLog,v 1.19 2013/10/16 09:49:56 fordfrog Exp $
+
+*netbeans-mobility-7.4 (16 Oct 2013)
+
+  16 Oct 2013; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-7.4.ebuild:
+  version bump
 
 *netbeans-mobility-7.3 (21 Feb 2013)
 
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index fb9e2c5769fd..64915a248eec 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST 2EF44D925014E2EF76416535CC0F3A7C7E9F4AE1-perseus-nb-1.0.jar 740490 SHA256 d2f00ba457d0d0483cea1fb1345729edd50f4aba2f4290ec89381ee7ee7741ac SHA512 275e5e8f85f2357c8886931ec67c18167aab220d71969dbbfadccf44c5c77dc7e012d35d047aa90bab7d34289f5e56d0bf5fdc9ff3995a9d452ec31c3cc21ee6 WHIRLPOOL 9cc5b383a0065cbc1d524b9dc0473803fdedf27124a943fc5114294f84d9207287fe398b4def77f8acd88a9a04ab129c3c85a3002921b1d1aaafed16f972e661
 DIST 2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip 70993 SHA256 3c64c4cba2c281f3ce431655f4f79dcb664cc9aa31f963f0d742442dea7ddc65 SHA512 3c867e5b0136858fe73ff2db04c920d423b11810872c471d6d2730c513d67fce50dce53a8458bf7edf83fc39f2dd3ed9f61a4f3b25a7e2b7131e8da19ecad5fa WHIRLPOOL 9e1425d26b3c45175a4f58b3d0063dc519993d0fa413a34c83e435359c07d4875191e23792751a2055e817a4e5df6475dde3df4de75bdf1f2e47bd6088053043
 DIST 3A5C68B301F42D3E8D89976F90D4E2AE6F2984B6-nbactivesync-5.0.jar 7854 SHA256 f3ec083ed777ef103129cbf5d21a88dff0e276910ebd0ef5022b9a8d6590302d SHA512 e79f0c47d3bf70863f09509ced681aa25a39a57d1c99ba47fd338bd4bae8ac70b418b600f8b9aa26a016966bd722e86294acbf01108aa443502e30be24b81b49 WHIRLPOOL 8af0db3f8587b3e62a6c905852374c7fcaee96e46d286c325e9dfa250a03edede6941194d999034de9037be95e4dd3a756516e11f8d3b384e1d596426b91d2f6
@@ -18,18 +15,14 @@ DIST netbeans-7.2-201207171143-src.zip 174804170 SHA256 7fbbb9e2d3daa41344800a75
 DIST netbeans-7.2-r1-build.xml.patch.bz2 2476 SHA256 ba0812d86c8d77cc69c75899d5b070d8b8c7dd1e33b5bdc7ac6e166d5015601d SHA512 8d0a2d80afafe875d9872a0aa15b2ade41f174ae522bc0363021e8d490dfd43b09a97af9c77dd635b56964fb57fd218424c17de0a13b946d55247db06a3e8c33 WHIRLPOOL 3833520b791d6fcb3b531b4cb1fbeec2fbadcc05e8c8a439794ea83bfb315e538d6039d2a6a188735cd996e916a1e5e88871050392947a2f5702accf9fceb16a
 DIST netbeans-7.3-201302132200-src.zip 179174245 SHA256 5be4ee16868ca3f2a73b397ca1b1a83d7603657722cb033a37925e8ee0ebeab3 SHA512 c616ae3e148b677ad74b4e113fe2d5f9e97029a601abf39558e35c57085362dc802d0eb26be9ab05731bce14dd10c5af22d4b77251471da95421ad28e08ce700 WHIRLPOOL 66670d62c023f321220c7cd416c0d0347055e618c9501df56934a35bf6f15ebde37245c78ab6416ce3c5cc733b4f8bc0e9c9d2a94f8d940e64443dab2e5967f8
 DIST netbeans-7.3-build.xml.patch.bz2 2463 SHA256 ec0a58213907f7c8656ded1ba3f21dd0a2197b6eed46d7d5ba37f6afb0ae2a79 SHA512 1f8164efab23f7fdaf7da0191f36043cc10d9a4865e38761c24c83a822d8b1b7abfb891f6072654fdfcd314f6fdf0010cb8560c2222ec07e4b4b217b91142079 WHIRLPOOL 47d8e784b65a9863d6c9c122288720544384b4f9f6815325247cf12fc2dac5678b27b72e0b7580052096957acc245b7f8f1c54b97a1877a3ba1021bf871d08dc
+DIST netbeans-7.4-201310111528-src.zip 185900858 SHA256 b6c584c2091d600dcb4d10a732812864265f6ec776da11b4f700195eb3d6fd05 SHA512 424124000026e161bf91688106c0d25668869abde49b6f0fad1a2a8a9ca3b40e664f14056132f3ded43bc319056b2ac56a705c3624f175f279824cae42f9a9a2 WHIRLPOOL 0200e37fc6ca22d8e679327c55fb2fec2fc030106e3802cdec2dde2766df354faec3659a4867cbfc908c673c1a770f59b37c6b4b9cd391b3844d6af11cafc01a
+DIST netbeans-7.4-build.xml.patch.bz2 2685 SHA256 3ffbe61e33ab28f39acbe28209469c673ac97ba4620e9ab7391537b9d242da6a SHA512 247c67cf53ee40e94768d547218664cbf82c487f16982a43daed054a17327f168f35319ed4fa2def995adf3f0a6d25f85a3bb23ff4a84aa4e4f751257f255545 WHIRLPOOL bceeaebe6a7079910cfabcbf48738694b8b86a5ab7147002182eba3c305a310febe5861abdc3e63df904b45fcf3a5ecb3007c15611b59b4ce53406e578d13c47
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e SHA512 7f28a0b2536ea84ebaba26df072411f62db01873e7803f2e28400b55bd61f0857b5508668bd03894364333edf6b8cf9901b823980a8f51f8d6a711bd3a47cb59 WHIRLPOOL 74dcc47859101722f9879bf0cf2dadd210555560b2fcd036e43ac099c71fe0c712b360aadad8e88092a324c93ff42fc2e467e89e3227f23a24d55b9c9e2c27b6
 EBUILD netbeans-mobility-7.0.1.ebuild 8776 SHA256 a44ff4795261bea5235e42903f9a62deab549d260144132f0ca120b9155f6391 SHA512 8bc1919a3f78e10b62fe09e3a384c33829f058edfd0899c860caa1431ad3bf220e5aad1fb7a019c76e823bd5ca4418d12294d5b391e7fe8f08350c1cd92b7777 WHIRLPOOL 1130d0934eff520f0d75943251dd351a9e69478bc2ab988eb37af9988b1f8554ffde4e12ac1ed3004aa99a87a787a7a5b281025cdb17a59d098e2abec3dc3db4
 EBUILD netbeans-mobility-7.1.1.ebuild 7664 SHA256 7ebca6134729846ddec3395e28783c51d0567b790d1d376386abfe80cef060da SHA512 7ed40928fb1322c0a9e06125903993a0d3f2d4d1f23af8e99282de374265e74c5c97d13fdcdaa99dc7b41f6ba49568d31824bd3ed5ded9630285a22be6d64dbc WHIRLPOOL da60cb6314ed249c8fa6b220c3284d45fab01445c5ecb8dad11a2110c08031d0bf1295bda724e5ed525e77bd2286badbb27d176e89a7115af1a55a5d6f913bbe
 EBUILD netbeans-mobility-7.1.2.ebuild 7658 SHA256 ee0b43da1c64830974cd76cb1adc9c2250384b393b8d97a345d5bf1a11a4e44d SHA512 08ab9a8c2997e2da712f6b1bd840e044937180d8196eef8577700b632278d45ce10146476e774e950543a9647bb8664f2dbca0ab156cc89a7c6d37235fc107bd WHIRLPOOL ad55ee7c429d97d1e747ba91a5575bae5f7375f3d77e3997f8b54301b85aeb4b8d0fff4a0305c429177046beb803511de01f3f04291135ae604103ed991d8685
 EBUILD netbeans-mobility-7.2.ebuild 6683 SHA256 c5adf473cc986ddb07800f8894608a38d1b266a1b6984f129cc4570a1b4b6697 SHA512 922b0b3e402576cdc7a39c1ceddeaa163e3d877cf6e26fd06f6e5000b35c15e1d9d31900614e3225f2c999a8eaea5962fd5d798ae4157706ecbd561cea5a0d3c WHIRLPOOL da72a98f94ee0e5db86335977dd617303b2ef1c5f4b9ac033076d4406235a13692b4265edffaf70fd3da4051527ccb41a8956d5a19ee561c096b795769e6393d
 EBUILD netbeans-mobility-7.3.ebuild 6707 SHA256 fddcf9b958a0d2dd5f9d73643e49803f99acaab6839866b8eba7c479fb03c540 SHA512 ac36ac8539d871bc4cb4b63384fea20564fce49c2f0f6ffc69ade1a0492caed2bc9bf98709647eb351631db7cbf48a287502a7d09d5109ca88143a35ad87b074 WHIRLPOOL 7dda53985453bb2e5863e91007ca1afc6bbf8502fb050c5bf724ce987db05405017e1400faaa07e49867f65c2db3a2a4cb3e4ce9657cabb1b7baa1417c96213e
-MISC ChangeLog 2737 SHA256 2686aae998528660f72e83c714dab4bc6ca742120f91f0b1471aae798a8b22f3 SHA512 717aaaa89762c7a2fdaa69f4d80121faa2969f2018ebf4a9afe64dd5d973e61d970c0e36d2e6cf19f1bc9607fb46fa98634d4bd9a7cfff98a726b905430e86c1 WHIRLPOOL cb9e4beae5b65e373abe7fd6c3047da9d331f19f57c1268c4bb4b77de8f2f1d3ad327bc881b4be63d90e5a5c49bf66718dda5c98f7a54ea0839f31e38116a614
+EBUILD netbeans-mobility-7.4.ebuild 6882 SHA256 eccc80e706cde8c78162d6e691aba02452ae8e5f17b93faac757e3e30ab22792 SHA512 63a16de68f1662e1da62d7a45362c46c05d2b85ff8400b5493c1efa83ba0531bfc490ad279a478bb5e4d7d411b53e52a940d12e8b970e4672c662d5893ac5420 WHIRLPOOL 1476b2be138882650abd10620a0cd8ae5289c444832193f9980783f7fabe1a528056a39d1d9f7a05c674f50df5161ee26975e2b908ecd5bbe66c1e5b9adf5929
+MISC ChangeLog 2876 SHA256 63c2132290b8569aee60cd0a5787f4705f660c8cc6812a4c68b0bf640554b501 SHA512 276a87ec27c5119c5f0ecbd1b203b894862c04f93526c3ba9fa6692f020a7abc0ce1e75bb2f907f5d14bb1f74fac878a211216889e6d8ee9ddd107ffc5739e66 WHIRLPOOL b9fbb7259cff18b8fe7b84f940745e2103052ac97847407261a76be827ca5fd5cd8b01e841849aea5af3b9d2412a081f5799756a054b159470c9415d0999168d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlEmQm4ACgkQ5LnnVc/kfi+U7gEAkQbsUMgKsaxqP/5y9XvsO/YR
-qzfbRIEfYAu/OFtoFxkA+gOgxjfhzSpDSpUcX3aUQRYfVPq/0+TxfGr0Xf7HZuL7
-=AgLJ
------END PGP SIGNATURE-----
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-7.4.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-7.4.ebuild
new file mode 100644
index 000000000000..9bcc46e216f4
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-7.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-mobility/netbeans-mobility-7.4.ebuild,v 1.1 2013/10/16 09:49:56 fordfrog Exp $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="7.4"
+SOURCE_URL="http://download.netbeans.org/netbeans/7.4/final/zip/netbeans-7.4-201310111528-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.4-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/ant-contrib:0
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-7.4-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.4-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm commons-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}