From cb442f837c5ca3acbaa818b0d9a316bcd50adf52 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 19 Nov 2011 17:30:05 +0100 Subject: [PATCH] app-admin/opsi-configed: cleanup & eapi4 (Portage version: 2.2.0_alpha75-r1/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) --- app-admin/opsi-configed/ChangeLog | 4 ++ app-admin/opsi-configed/Manifest | 6 +- .../opsi-configed-4.0.1.16.ebuild | 8 +-- .../opsi-configed-4.0.1.9.ebuild | 57 ------------------- 4 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 app-admin/opsi-configed/opsi-configed-4.0.1.9.ebuild diff --git a/app-admin/opsi-configed/ChangeLog b/app-admin/opsi-configed/ChangeLog index d415f39..ddccea5 100644 --- a/app-admin/opsi-configed/ChangeLog +++ b/app-admin/opsi-configed/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Nov 2011; Mario Fetka + -opsi-configed-4.0.1.9.ebuild, opsi-configed-4.0.1.16.ebuild: + cleanup & eapi4 + 23 Jun 2011; Mario Fetka opsi-configed-4.0.1.9.ebuild: Cleanup of ebuild diff --git a/app-admin/opsi-configed/Manifest b/app-admin/opsi-configed/Manifest index f770689..8eb4edf 100644 --- a/app-admin/opsi-configed/Manifest +++ b/app-admin/opsi-configed/Manifest @@ -1,6 +1,4 @@ DIST opsi-configed-4.0.1.16-1.1.src.rpm 1746091 RMD160 24cb7729ce63cabded788143130560a15c709e5b SHA1 3a64ac1f5b28bc925d4b48f6d7bfaa0321127237 SHA256 4b3e65b96659d9b6ecac98e8df8ce34b5e917c4e37b0f910431fbb435a28b93e -DIST opsi-configed-4.0.1.9-1.1.src.rpm 1637493 RMD160 95b69e7eb4fd0dffcc2e7cbb9d5a4238295b5eca SHA1 83a3993299bbd01bf6a96d54535e73b1079fc94f SHA256 d62fd7def9bf862d450aadc4d49cf495636df680c3cad1ac60ba95b301f5ebe5 -EBUILD opsi-configed-4.0.1.16.ebuild 1544 RMD160 9e5c8c89dca2768a9de57bee37ed421636f3925c SHA1 35a1af74b65a8d714edb24394b9cab76a275b083 SHA256 ce93b09be82a1e085281b2032b1af58625f5896e7576180c5f416416744f855c -EBUILD opsi-configed-4.0.1.9.ebuild 1544 RMD160 9e5c8c89dca2768a9de57bee37ed421636f3925c SHA1 35a1af74b65a8d714edb24394b9cab76a275b083 SHA256 ce93b09be82a1e085281b2032b1af58625f5896e7576180c5f416416744f855c -MISC ChangeLog 589 RMD160 e6b74fa33aef4e8fd8ad9575092198159fe19eb2 SHA1 ddb72a81197fa526713f301947d0d227babea43c SHA256 7f0946855ae657939174b586379172d614ee5b70aad5a20d9e780f8dcd6c9f52 +EBUILD opsi-configed-4.0.1.16.ebuild 1543 RMD160 dedac8fb4b0732daacdbe0afabf42165651adcf9 SHA1 812ec28b8bcbdd8c20aa4d161b011173fd090a94 SHA256 adaafb2e3f2f745e38a747c0eb62719bca04b265b41fe08c90a8b9c4cafa9014 +MISC ChangeLog 723 RMD160 d208c8e8be326f173c5fbcaa97a59af001256cb5 SHA1 6cce25eb80b913b478f469c19bc635d8e0476e30 SHA256 3cc03357d2c17a3031ac5de7e1e46e00f892c2946242d998e274617dc7c759c0 MISC metadata.xml 226 RMD160 bebcbe7a5e3d2be83c25e006192f71ebf45abb14 SHA1 ec2b713fc2363b8c51e9c164d0802eeb59d9d296 SHA256 a9d3f7df2362a9a7ddcbe05c5d97d726eeb4bab135b21643508149a08bf6a2b2 diff --git a/app-admin/opsi-configed/opsi-configed-4.0.1.16.ebuild b/app-admin/opsi-configed/opsi-configed-4.0.1.16.ebuild index 99c484f..77e215f 100644 --- a/app-admin/opsi-configed/opsi-configed-4.0.1.16.ebuild +++ b/app-admin/opsi-configed/opsi-configed-4.0.1.16.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI=4 JAVA_PKG_IUSE="source" @@ -19,14 +19,14 @@ IUSE="" KEYWORDS="~amd64 ~x86" COMMON_DEP="dev-java/swingx:1.6" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=">=virtual/jre-1.6 ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.6 ${COMMON_DEP}" RESTRICT="" SLOT="0" -src_prepare() { +java_prepare() { rm -rf *.jar mv classes build } diff --git a/app-admin/opsi-configed/opsi-configed-4.0.1.9.ebuild b/app-admin/opsi-configed/opsi-configed-4.0.1.9.ebuild deleted file mode 100644 index 99c484f..0000000 --- a/app-admin/opsi-configed/opsi-configed-4.0.1.9.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 eutils rpm - -RPM_VER="1.1" - -DESCRIPTION="opsi depot server" -HOMEPAGE="http://opsi.org/" -SRC_URI="http://download.opensuse.org/repositories/home:/uibmz:/opsi:/opsi40/openSUSE_11.3/src/${P}-${RPM_VER}.src.rpm" - -LICENSE="GPL-2" -IUSE="" -KEYWORDS="~amd64 ~x86" - -COMMON_DEP="dev-java/swingx:1.6" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEP}" -RESTRICT="" -SLOT="0" - -src_prepare() { - rm -rf *.jar - mv classes build -} - -src_compile() { - ejavac -encoding UTF-8 -sourcepath src -classpath $(java-pkg_getjars swingx-1.6) -d build src/de/uib/configed/configed.java - ejavac -encoding UTF-8 -sourcepath src -classpath $(java-pkg_getjars swingx-1.6) -d build src/de/uib/configed/configedApplet.java - ejavac -encoding UTF-8 javainfo.java - jar -cvfm configed.jar MANIFEST.MF -C build/ . -} - -src_install() { - java-pkg_jarinto /usr/lib/configed - insinto /usr/lib/configed - doins index.html javainfo.class - java-pkg_dojar "${S}"/configed.jar - # get the swingx.jar for the java webstart into the right place - java-pkg_dojar "${ROOT}"/usr/share/swingx-1.6/lib/swingx.jar - java-pkg_dolauncher ${PN} --main de.uib.configed.configed - - insinto /usr/share/configed - doins configed_icon.png - - newicon configed_icon.png ${PN}.png - make_desktop_entry ${PN} "Opsi Configuration Editor" ${PN} Settings;Utility; - - use source && java-pkg_dosrc "${S}"/src/* -}