diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2009-01-13 14:26:29 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2009-01-13 14:26:29 +0000 |
| commit | 08a9e0931195137f9a2e8c536cf56ee5e8ecb248 (patch) | |
| tree | 56cb9158a8d690555e015709d8aa8058c9ca4dc4 | |
| parent | Better kde set (diff) | |
| download | pauldv-08a9e0931195137f9a2e8c536cf56ee5e8ecb248.tar.gz pauldv-08a9e0931195137f9a2e8c536cf56ee5e8ecb248.tar.bz2 pauldv-08a9e0931195137f9a2e8c536cf56ee5e8ecb248.zip | |
Use builtin junit 4, making junit work properly
svn path=/trunk/overlay/; revision=83
| -rw-r--r-- | dev-util/eclipse-sdk/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/eclipse-sdk/eclipse-sdk-3.4.1.ebuild | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest index 0f523cd..10c5675 100644 --- a/dev-util/eclipse-sdk/Manifest +++ b/dev-util/eclipse-sdk/Manifest @@ -8,5 +8,5 @@ AUX 3.4/eclipserc-3.4 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 a AUX 3.4/fedora/eclipse-libupdatebuild2.patch 722 RMD160 6baa55ab7545f02e808ed05c901f77fb1d6709d4 SHA1 29f86a88e8ddc048e1fb4206a73824b2a4ed742d SHA256 ba7af44c1751b749591a53cb2c80852ef08f2f003917a5914042937e2d05b464 AUX 3.4/fedora/eclipse-pde.build-add-package-build.patch 11604 RMD160 ba63781fa77452e4c36eae7e07d81b7d39f5ec29 SHA1 7ee30f8fc2732125e1f2ba01038922d995b21456 SHA256 d361930896c940c09a7faf41f2c8d7843d56be9b90391e91538890062e5d7803 DIST eclipse-sourceBuild-srcIncluded-3.4.1.zip 106290656 RMD160 b5244cd94199b2d359e7e4d1f93018c9050e29de SHA1 484cdf90c05fab47492f7d2ce1fff64422373a9b SHA256 cb451bcc8866ab289b3a322e17eda7d20429463e8b3f329f66626b45b0fd6824 -EBUILD eclipse-sdk-3.4.1.ebuild 15735 RMD160 26b43faaea8c807e46adf55654f5704ff450db42 SHA1 bb12d29fc093b15b96214ad7510eb2d3738d5409 SHA256 ec34ab066aeb204d6fa0ae11b16137d29fafe54a271840cd904dee972af4770f +EBUILD eclipse-sdk-3.4.1.ebuild 15721 RMD160 1a283708028e962c35e2da72148f327793ad570b SHA1 ff4e0aa67d25182b280839f7415227274486a447 SHA256 ba38a377d1f450a704bc4e098288ebce4ec47ebee3ba975b75cda6a3c55ceb51 MISC NOTES 109 RMD160 46488535b78316726bcd68db93ba92f6660dce66 SHA1 e329071628cc4ac1401faa44c8e7976597cba2c6 SHA256 c914208f0ac7675bd3b6c9d306387dca733554bb771eb1add872c7b9c929dfba diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.4.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.4.1.ebuild index 8e59daf..b057988 100644 --- a/dev-util/eclipse-sdk/eclipse-sdk-3.4.1.ebuild +++ b/dev-util/eclipse-sdk/eclipse-sdk-3.4.1.ebuild @@ -50,7 +50,6 @@ CDEPEND="dev-java/swt:${SLOT} >=dev-java/tomcat-servlet-api-5.5.25-r1:2.4 dev-java/cldc-api:1.1 dev-java/junit:0 - dev-java/junit:4 dev-java/lucene:1.9 dev-java/sat4j-core:2 dev-java/sat4j-pseudo:2" @@ -140,7 +139,7 @@ src_install() { ln -snf /usr/share/ant/bin plugins/org.apache.ant_*/ || die ln -snf /usr/share/ant/lib plugins/org.apache.ant_*/ || die cp -af "${S}"/plugins/org.junit_*/*.jar plugins/org.junit_*/ || die - cp -af "${S}"/plugins/org.junit4/*.jar plugins/org.junit4_*/ || die +# cp -af "${S}"/plugins/org.junit4/*.jar plugins/org.junit4_*/ || die # Install startup script. dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die @@ -303,14 +302,14 @@ remove-bundled-stuff() { unbundle-jar org.sat4j.pb sat4j-pseudo:2 # Make the junit4 case easier. - ln -snf org.junit4 org.junit4_ || die +# ln -snf org.junit4 org.junit4_ || die unbundle-dir org.apache.ant ant-core,ant-nodeps lib unbundle-dir org.junit junit . - unbundle-dir org.junit4 junit-4 . +# unbundle-dir org.junit4 junit-4 . # Don't include sources for junit4. - sed -i '/junitsrc/d' org.junit4/customBuildCallbacks.xml || die +# sed -i '/junitsrc/d' org.junit4/customBuildCallbacks.xml || die # Unbundle SWT and make @dot directory to keep build happy. ${BUILDPARSER} -i Bundle-ClassPath "external:$(java-pkg_getjars swt-${SLOT})" org.eclipse.swt.gtk.linux.${eclipsearch}/META-INF/MANIFEST.MF || die |