[patch] sqldeveloper 3.2.20.09.87 --> 4.0.1.14.48 ebuild patch

sqldeveloper-version-bump.patch (text/plain), 2.36 KB, created by Alex Turbov on 2014-04-01 09:43:18 UTC

--- /usr/portage/dev-db/sqldeveloper/sqldeveloper-3.2.20.09.87.ebuild	2013-03-07 23:01:07.000000000 +0400
+++ /var/db/paludis/repositories/zaufi-overlay/dev-db/sqldeveloper/sqldeveloper-4.0.1.14.48.ebuild	2014-04-01 17:34:04.000000000 +0400
@@ -19,7 +19,8 @@
 DEPEND="mssql? ( dev-java/jtds:1.2 )
 	mysql? ( dev-java/jdbc-mysql:0 )
 	sybase? ( dev-java/jtds:1.2 )"
-RDEPEND=">=virtual/jdk-1.6.0
+RDEPEND=">=virtual/jdk-1.7.0
+	dev-java/java-config:2
 	${DEPEND}"
 
 S="${WORKDIR}/${PN}"
@@ -35,7 +36,7 @@
 
 src_prepare() {
 	# we don't need these, do we?
-	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} \;
+	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} +
 
 	# they both use jtds, enabling one of them also enables the other one
 	if use mssql && ! use sybase; then
@@ -52,25 +53,13 @@
 	if use mysql; then
 		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf
 	fi
-
-	# this fixes internal Classpath warning
-	cd "${T}"
-	unzip -q "${S}"/jdev/extensions/oracle.jdeveloper.runner.jar META-INF/extension.xml
-	sed -i 's@../../../oracle_common/modules/oracle.nlsrtl_11.1.0@../../jlib@' META-INF/extension.xml || die
-	zip -rq "${S}"/jdev/extensions/oracle.jdeveloper.runner.jar META-INF/extension.xml
-	rm -rf META-INF
-
-	# this fixes another internal Classpath warning
-	cd "${T}"
-	unzip -q "${S}"/sqldeveloper/extensions/oracle.datamodeler.jar META-INF/extension.xml
-	sed -i 's@<classpath>${ide.extension.install.home}/lib/ActiveQueryBuilder.jar</classpath>@<classpath>${ide.extension.install.home}/../../lib/ActiveQueryBuilder.jar</classpath>@' META-INF/extension.xml || die
-	zip -rq "${S}"/sqldeveloper/extensions/oracle.datamodeler.jar META-INF/extension.xml
-	rm -rf META-INF
 }
 
 src_install() {
 	dodir /opt/${PN}
-	cp -r {dataminer,ide,javavm,jdbc,jdev,jdev.label,jlib,jviews,modules,rdbms,readme.html,sleepycat,${PN},sqlj,timingframework} \
+	# NOTE For future version to get that line (what to copy) go to the unpacked sources dir
+	# using `bash` and press Meta+_ (i.e. Meta+Shift+-) -- that is a builtin bash feature ;-)
+	cp -r {configuration,d{ataminer,ropins,vt},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,r{dbms,eadme.html},s{leepycat,ql{cli,developer,j},vnkit}} \
 		"${D}"/opt/${PN}/ || die "Install failed"
 
 	dobin "${FILESDIR}"/${PN} || die "Install failed"