From 1a3c0abd325733d97b7e950be00a41aacdc9dfc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20K=C3=B6ster?= Date: Thu, 21 Mar 2013 19:01:11 +0100 Subject: * Eclipse dependencies in own packages (not build from source yet) * Build swt-chart --- app-office/hibiscus/Manifest | 2 +- app-office/hibiscus/hibiscus-2.4.2.ebuild | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'app-office/hibiscus') diff --git a/app-office/hibiscus/Manifest b/app-office/hibiscus/Manifest index bbc9852..be6fbca 100644 --- a/app-office/hibiscus/Manifest +++ b/app-office/hibiscus/Manifest @@ -5,4 +5,4 @@ AUX 2.4.2-hbci4java-so-filename.patch 1697 SHA256 22df5c01119aa6a6b818557090e08f DIST hibiscus-2.2.1.zip 5245507 SHA256 d026229bb24b4502b42da193538c0fc35f07d05bce1e9469cf25bb248e4b3495 SHA512 a18ad22859de1ac8faf9b5e286f82f2dd3cbf445460055313440c88471b10e32e0a59b20b824ae1f1817b4a3366c2dba9087be4798dcac0fdc7df02615a9a479 WHIRLPOOL 4dae30ee699d2cda33cf194fa7750e6a68a8d1c1c5938415d1f1fd05306d03598aec729f9e89c4c045923d153a8d6f24d547c6ceb2f6c2ecfdb321c769cd53b2 DIST hibiscus-2.4.2.zip 5260678 SHA256 a410c0b79ee8fae3b12405332c81e8fa8908b51beb70bc827105241b29bcdea2 SHA512 348e953dd19a71527c486430021b89452a9b5adafc7900424ccd07fb5423de1ca42c7b80e3d73691772ccf467aa6ca39635a0ecf3054478278b81ae598b81ffb WHIRLPOOL afae77fbbb7ca687ad93c3a3341440e82e611954515583a39c2b59bc7ff03c0aa64b77e5e2df896c1fc9db79b60f4481d86538f34c5bc031a4ae8b9d2fb2b865 EBUILD hibiscus-2.2.1.ebuild 2445 SHA256 9a388dee18ee61e8bcb28281de8b741fca433509f29c778b5c8193315cc31cb8 SHA512 b8d96be8ddb7e196357931c0022e3f544574ec76942144f2a2347b06143699dc8b4faae787a77b2e15a999e278a8103092ec558cbb7ae377f1d540b647049cce WHIRLPOOL dd308bc0976123b521caf5408a45f31ee9cb4412ac3318bd6d97a78fc4d684cb408977412dbf8103952bc14da2ab0c3791812eb5ce3b9bead1a73bf5c5695503 -EBUILD hibiscus-2.4.2.ebuild 2547 SHA256 e1480cb269e0eabd2d1a4818b97b6f683845c25d2f1df86b4099ac2c833b3ddf SHA512 0e638b3565b72a74a65eb10a1cf6c9299955464b8d9cf63daf8164f248a63c7e5c19ebd5ccd460ee4c62f946a55452be54a460c2f3902d2bd0ed9e1fea132fd5 WHIRLPOOL 652343b8b98cf44532e0fd82953cdf513457a3ee1c7696ac67c17c846012fc962d460356290003ce6d712c8b4722cea77cc80c643741de7eeee75f7f2c508230 +EBUILD hibiscus-2.4.2.ebuild 2601 SHA256 9ea4d15291f8aa1bd950170573fe53c8a5e3c6d6a2556c99eb6282154cced747 SHA512 48eae5c2b542d99428f310c38f0ef05ac108368cfef1612fa75903be86738f3e4d869365364dabf1393f8549f65953ba85650bea5b1f2a8baf127da988c965bf WHIRLPOOL 689466172ee30ea839f2cb2af76fedb258bfc37b619678bfc825ec5b173d4020f094184cfe09e326ad036cce0d92441ddcf42e9a23744a0ed82dc635e5ddfb98 diff --git a/app-office/hibiscus/hibiscus-2.4.2.ebuild b/app-office/hibiscus/hibiscus-2.4.2.ebuild index 7e6c79c..62c281c 100644 --- a/app-office/hibiscus/hibiscus-2.4.2.ebuild +++ b/app-office/hibiscus/hibiscus-2.4.2.ebuild @@ -18,8 +18,8 @@ IUSE="" COMMON_DEP="=dev-java/jameica-${MY_PV}* >=net-libs/willuhn-hbci4java-2.5.12.30 =dev-java/obantoo-1.5.2 - >=dev-java/supercsv-1.31" - #>=dev-java/swt-chart-0.7.0" + >=dev-java/supercsv-1.31 + >=dev-java/swt-chart-0.7.0" RDEPEND=">=virtual/jre-1.6 ${COMMON_DEP}" @@ -33,12 +33,13 @@ java_prepare() { #epatch "${FILESDIR}/${PV}-hbci4java-api.patch" epatch "${FILESDIR}/${PV}-hbci4java-so-filename.patch" - rm -v ${S}/lib/*.{jar,so,dll,jnilib} || die + #rm -v ${S}/lib/*.{jar,so,dll,jnilib} || die + #rm -rv ${S}/lib/swtchart + rm -rv -v ${S}/lib/* #rm -v ${S}/lib/{itext-2.0.1.jar,obantoo-bin-1.5.1.jar,postgresql-8.3-604.jdbc3.jar,supercsv-1.31.jar,libct.so,libhbci4java-card-freebsd-64.so,libhbci4java-card-linux-32.so,libhbci4java-card-linux-64.so,libhbci4java-sizrdh-linux-gcc2.so,libhbci4java-sizrdh-linux-gcc3.so,libtowitoko-2.0.7-amd64.so,libtowitoko-2.0.7.so,hbci4java-card-win32.dll,hbci4java-card-win32_x86-64.dll,hbci4java-sizrdh-win32.dll,libhbci4java-card-mac-os-x-10.6.jnilib,libhbci4java-card-mac.jnilib} || die - #java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,supercsv,swt-chart - java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,supercsv + java-pkg_jar-from --with-dependencies --into ${S}/lib/ willuhn-hbci4java,obantoo,jameica,supercsv,swt-chart } src_compile() { @@ -53,7 +54,7 @@ src_install() { insinto ${plugin_dir} doins plugin.xml - doins releases/${PV}-0/${PN}/${PN}.jar + doins releases/${PV}-0/${PN}/${PN}.jar cp -R "${S}/updates" "${D}${plugin_dir}" || die "Install failed!" cp -R "${S}/sql" "${D}${plugin_dir}" || die "Install failed!" @@ -63,6 +64,8 @@ src_install() { dosym "$(java-pkg_getjars willuhn-hbci4java)" ${plugin_dir}/lib/ dosym "$(java-pkg_getjars obantoo)" ${plugin_dir}/lib/ dosym "$(java-pkg_getjars supercsv)" ${plugin_dir}/lib/ + dosym "$(java-pkg_getjars swt-chart)" ${plugin_dir}/lib/ + dosym "$(java-pkg_getjars itext-5)" ${plugin_dir}/lib/ newicon icons/${PN}-icon-16x16.png ${PN}-icon-16x16.png || die "newicon failed" newicon icons/${PN}-icon-32x32.png ${PN}-icon-32x32.png || die "newicon failed" -- cgit v1.2.3