[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2023-03-13 Thread Sam James 
commit: 1f7e42b354c7b84662fbb55c8c9b2e938e800056
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Mar 11 18:30:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 13 18:03:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7e42b3

dev-java/miglayout: remove unused local USE flag [ swt ]

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30056
Signed-off-by: Sam James  gentoo.org>

 dev-java/miglayout/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
index 202ea9738f79..457503f62795 100644
--- a/dev-java/miglayout/metadata.xml
+++ b/dev-java/miglayout/metadata.xml
@@ -8,9 +8,6 @@
   
 For Java developers writing GUI layouts by hand that wants simplicity, power 
and automatic per platform fidelity, that are dissatisfied with the current 
layout managers in Swing, JavaFX and SWT, MigLayout solves your layout 
problems. User interfaces created with MigLayout is easy to maintain, you will 
understand how the layout will look like just by looking at the source code.
   
-  
-Add support for the SWT toolkit.
-  
   
 mikaelgrev/miglayout

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2023-03-13 Thread Sam James 
commit: 2fa80cb9c6d63dc24d6430b5bf1c7fecab1687af
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Mar 11 18:01:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 13 18:03:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa80cb9

dev-java/miglayout: drop 4.0-r1

There is no consumer depending on a stable version of this package.

Closes: https://bugs.gentoo.org/831553
Closes: https://bugs.gentoo.org/830445
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 dev-java/miglayout/Manifest|  1 -
 dev-java/miglayout/miglayout-4.0-r1.ebuild | 64 --
 2 files changed, 65 deletions(-)

diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index c7e87d781ecf..1206d63a2d6d 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,2 +1 @@
-DIST miglayout-4.0-sources.jar 194675 BLAKE2B 
9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3
 SHA512 
27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
 DIST miglayout-5.3.tar.gz 627150 BLAKE2B 
2b28b3dd95d84db1665308a2908c6ddf8f0e285431ffc03af0275f7005d98117f873b0752f9b1f428b213a30c9e020b626eb0e6709470c62eac46480c3aab542
 SHA512 
ee711a453a9e2962017eed9363e4b8c2fb1fb28d9b36455d928b60db40262be310e6d2ab6c9f3ac286f3975e9927f8a8a77827a27cd1cb2238b2033c38a67cdb

diff --git a/dev-java/miglayout/miglayout-4.0-r1.ebuild 
b/dev-java/miglayout/miglayout-4.0-r1.ebuild
deleted file mode 100644
index c41f360b7e62..
--- a/dev-java/miglayout/miglayout-4.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2
-
-DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
-HOMEPAGE="https://www.miglayout.com;
-SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="swt"
-
-COMMON_DEPEND="swt? ( dev-java/swt:3.7 )"
-BDEPEND="app-arch/unzip"
-RDEPEND="
-   ${COMMON_DEPEND}
-   >=virtual/jre-1.8:*
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   >=virtual/jdk-1.8:*
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-   default
-
-   mv net/miginfocom/{demo,examples} . || die
-   mv demo/* examples || die
-
-   if ! use swt; then
-   rm -r net/miginfocom/swt || die
-   fi
-
-   find net -name '*.java' > sources.lst
-}
-
-src_compile() {
-   local classpath
-   use swt && classpath=( -classpath "$(java-pkg_getjars swt-3.7)" )
-
-   mkdir classes || die
-   ejavac "${classpath[@]}" -d classes @sources.lst || die
-   jar -cf ${PN}.jar -C classes . || die
-
-   if use doc; then
-   javadoc "${classpath[@]}" -author -version -d api @sources.lst 
|| die
-   fi
-}
-
-src_install() {
-   java-pkg_dojar ${PN}.jar
-
-   use doc && java-pkg_dojavadoc api
-   use examples && java-pkg_doexamples examples
-   use source && java-pkg_dosrc net
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2023-03-11 Thread Sam James 
commit: ba23885dbfdca4493d9549278eb0e014bfe072f3
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb 11 19:40:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:15:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba23885d

dev-java/miglayout: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29217
Signed-off-by: Sam James  gentoo.org>

 dev-java/miglayout/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-java/miglayout/metadata.xml b/dev-java/miglayout/metadata.xml
index 9863d966b13b..202ea9738f79 100644
--- a/dev-java/miglayout/metadata.xml
+++ b/dev-java/miglayout/metadata.xml
@@ -11,4 +11,7 @@ For Java developers writing GUI layouts by hand that wants 
simplicity, power and
   
 Add support for the SWT toolkit.
   
+  
+mikaelgrev/miglayout  
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2023-03-11 Thread Sam James 
commit: 42e9cb1b9df3c3b073c9f4280444d7d214c0bf1f
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb 11 19:28:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:15:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e9cb1b

dev-java/miglayout: add 5.3

Thia package is needed by >=games-strategy/freecol-1.0.0 and it contains
only those 2 modules needed there:
- miglayout-core
- miglayout-swing

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 dev-java/miglayout/Manifest |  1 +
 dev-java/miglayout/miglayout-5.3.ebuild | 78 +
 2 files changed, 79 insertions(+)

diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index dbb4d9c86ef1..c7e87d781ecf 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1 +1,2 @@
 DIST miglayout-4.0-sources.jar 194675 BLAKE2B 
9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3
 SHA512 
27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
+DIST miglayout-5.3.tar.gz 627150 BLAKE2B 
2b28b3dd95d84db1665308a2908c6ddf8f0e285431ffc03af0275f7005d98117f873b0752f9b1f428b213a30c9e020b626eb0e6709470c62eac46480c3aab542
 SHA512 
ee711a453a9e2962017eed9363e4b8c2fb1fb28d9b36455d928b60db40262be310e6d2ab6c9f3ac286f3975e9927f8a8a77827a27cd1cb2238b2033c38a67cdb

diff --git a/dev-java/miglayout/miglayout-5.3.ebuild 
b/dev-java/miglayout/miglayout-5.3.ebuild
new file mode 100644
index ..26caf78554f7
--- /dev/null
+++ b/dev-java/miglayout/miglayout-5.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.miglayout:miglayout-core:5.0 com.miglayout:miglayout-swing:5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="MiGLayout - Java Layout Manager for Swing, SWT and JavaFX"
+HOMEPAGE="https://miglayout.com/;
+SRC_URI="https://github.com/mikaelgrev/miglayout/archive/V${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RUN_ONLY="net.miginfocom.swing.MigLayoutTest"
+JAVA_TEST_SRC_DIR="swing/src/test/java"
+
+src_compile() {
+   einfo "Compiling miglayout-core.jar"
+   JAVA_JAR_FILENAME="miglayout-core.jar"
+   JAVA_SRC_DIR="core/src/main/java"
+   java-pkg-simple_src_compile
+   JAVA_GENTOO_CLASSPATH_EXTRA+=":miglayout-core.jar"
+   rm -r target || die
+
+   einfo "Compiling miglayout-wingore.jar"
+   JAVA_JAR_FILENAME="miglayout-swing.jar"
+   JAVA_SRC_DIR="swing/src/main/java"
+   java-pkg-simple_src_compile
+   JAVA_GENTOO_CLASSPATH_EXTRA+=":miglayout-swing.jar"
+   rm -r target || die
+
+   if use doc; then
+   einfo "Compiling javadocs"
+   JAVA_SRC_DIR=(
+   "core/src/main/java"
+   "swing/src/main/java"
+   )
+   JAVA_JAR_FILENAME="ignoreme.jar"
+   java-pkg-simple_src_compile
+   fi
+}
+
+src_test() {
+   # There was 1 failure:
+   # 1) testDPIScaling(net.miginfocom.swing.MigLayoutTest)
+   # java.awt.HeadlessException
+   # at 
java.desktop/sun.awt.HeadlessToolkit.getScreenResolution(HeadlessToolkit.java:122)
+   # at 
net.miginfocom.swing.MigLayoutTest.testDPIScaling(MigLayoutTest.java:28)
+   sed \
+   -e '/import org.junit.Test/a import org.junit.Ignore;' \
+   -e '/testDPIScaling()/i @Ignore' \
+   -i swing/src/test/java/net/miginfocom/swing/MigLayoutTest.java 
|| die
+}
+
+src_install() {
+   java-pkg_dojar "miglayout-core.jar"
+   java-pkg_dojar "miglayout-swing.jar"
+
+   if use doc; then
+   java-pkg_dojavadoc target/api
+   fi
+
+   if use source; then
+   java-pkg_dosrc "core/src/main/java/*"
+   java-pkg_dosrc "swing/src/main/java/*"
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2022-12-31 Thread Miroslav Šulc 
commit: b2c17e8098a63a24e10f25231527475c4d5d8853
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Dec 30 13:26:18 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 31 08:51:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c17e80

dev-java/miglayout: update HOMEPAGE

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/miglayout/miglayout-4.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/miglayout/miglayout-4.0-r1.ebuild 
b/dev-java/miglayout/miglayout-4.0-r1.ebuild
index d451c751b91f..c41f360b7e62 100644
--- a/dev-java/miglayout/miglayout-4.0-r1.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2
 
 DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
-HOMEPAGE="http://www.miglayout.com/;
+HOMEPAGE="https://www.miglayout.com;
 SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar;
 
 LICENSE="BSD"

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2021-11-11 Thread Miroslav Šulc 
commit: ba8ad6747192c6c26ad0799a466bc346ac6ed054
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Nov 10 18:35:16 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 12 07:37:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba8ad674

dev-java/miglayout: remove obsolete version

Closes: https://bugs.gentoo.org/797742
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22890
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/miglayout/miglayout-4.0-r2.ebuild | 59 --
 1 file changed, 59 deletions(-)

diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild 
b/dev-java/miglayout/miglayout-4.0-r2.ebuild
deleted file mode 100644
index c27929b85db..000
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2
-
-DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
-HOMEPAGE="http://www.miglayout.com/;
-SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="swt"
-
-COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"
-BDEPEND="app-arch/unzip"
-RDEPEND="
-   ${COMMON_DEPEND}
-   >=virtual/jre-1.8:*
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   >=virtual/jdk-1.8:*
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-   default
-
-   mv net/miginfocom/{demo,examples} . || die
-   mv demo/* examples || die
-
-   if ! use swt; then
-   rm -r net/miginfocom/swt || die
-   fi
-
-   find net -name '*.java' > sources.lst
-}
-
-src_compile() {
-   local classpath
-   use swt && classpath=( -classpath "$(java-pkg_getjars swt-4.10)" )
-
-   mkdir classes || die
-   ejavac "${classpath[@]}" -d classes @sources.lst || die
-   jar -cf ${PN}.jar -C classes . || die
-}
-
-src_install() {
-   java-pkg_dojar ${PN}.jar
-
-   use examples && java-pkg_doexamples examples
-   use source && java-pkg_dosrc net
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2021-06-23 Thread Agostino Sarubbo 
commit: a9d7f166c790bd235c13a07038bc3721f7969419
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun 24 04:25:28 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun 24 04:25:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d7f166

dev-java/miglayout: amd64 stable wrt bug #797742

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/miglayout/miglayout-4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild 
b/dev-java/miglayout/miglayout-4.0-r2.ebuild
index d65b8a08ff1..c27929b85db 100644
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="swt"
 
 COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2021-06-14 Thread Miroslav Šulc 
commit: 17726b5169a2c7c38980c3f3390db2441b3348cd
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jun 13 12:26:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun 14 07:52:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17726b51

dev-java/miglayout: remove doc flag (broken)

Closes: https://bugs.gentoo.org/786732
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21225
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/miglayout/miglayout-4.0-r2.ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild 
b/dev-java/miglayout/miglayout-4.0-r2.ebuild
index 863e44285ea..d65b8a08ff1 100644
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_IUSE="examples source"
 
 inherit java-pkg-2
 
@@ -49,16 +49,11 @@ src_compile() {
mkdir classes || die
ejavac "${classpath[@]}" -d classes @sources.lst || die
jar -cf ${PN}.jar -C classes . || die
-
-   if use doc; then
-   javadoc "${classpath[@]}" -author -version -d api @sources.lst 
|| die
-   fi
 }
 
 src_install() {
java-pkg_dojar ${PN}.jar
 
-   use doc && java-pkg_dojavadoc api
use examples && java-pkg_doexamples examples
use source && java-pkg_dosrc net
 }

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2021-05-23 Thread Miroslav Šulc 
commit: b626517c282eade5b800010505b13e32a01c7122
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue May 18 10:49:47 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May 23 09:16:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b626517c

dev-java/miglayout: swt:4.10 slot update

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/20865/commits/542538ea900969a67202a5d9bc876c71cb0dec27
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/miglayout/miglayout-4.0-r2.ebuild | 64 ++
 1 file changed, 64 insertions(+)

diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild 
b/dev-java/miglayout/miglayout-4.0-r2.ebuild
new file mode 100644
index 000..863e44285ea
--- /dev/null
+++ b/dev-java/miglayout/miglayout-4.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
+HOMEPAGE="http://www.miglayout.com/;
+SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="swt"
+
+COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+   ${COMMON_DEPEND}
+   >=virtual/jre-1.8:*
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   >=virtual/jdk-1.8:*
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+   default
+
+   mv net/miginfocom/{demo,examples} . || die
+   mv demo/* examples || die
+
+   if ! use swt; then
+   rm -r net/miginfocom/swt || die
+   fi
+
+   find net -name '*.java' > sources.lst
+}
+
+src_compile() {
+   local classpath
+   use swt && classpath=( -classpath "$(java-pkg_getjars swt-4.10)" )
+
+   mkdir classes || die
+   ejavac "${classpath[@]}" -d classes @sources.lst || die
+   jar -cf ${PN}.jar -C classes . || die
+
+   if use doc; then
+   javadoc "${classpath[@]}" -author -version -d api @sources.lst 
|| die
+   fi
+}
+
+src_install() {
+   java-pkg_dojar ${PN}.jar
+
+   use doc && java-pkg_dojavadoc api
+   use examples && java-pkg_doexamples examples
+   use source && java-pkg_dosrc net
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2021-05-04 Thread Miroslav Šulc 
commit: 356e83df3ba4949b81697b924338f703b1b527d1
Author: Wolfgang E. Sanyer  gmail  com>
AuthorDate: Mon May  3 19:55:34 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May  4 09:09:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356e83df

dev-java/miglayout: update java deps

This does not close bug 786732 because USE=doc is still broken. However,
it does update the java lower bound.

Signed-off-by: Wolfgang E. Sanyer  gmail.com>
Bug: https://bugs.gentoo.org/786732
Closes: 
https://github.com/gentoo/gentoo/pull/20608/commits/6ac21472948977fff33c2fef56301fda7d9d270a
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../miglayout/{miglayout-4.0.ebuild => miglayout-4.0-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/miglayout/miglayout-4.0.ebuild 
b/dev-java/miglayout/miglayout-4.0-r1.ebuild
similarity index 93%
rename from dev-java/miglayout/miglayout-4.0.ebuild
rename to dev-java/miglayout/miglayout-4.0-r1.ebuild
index 83297335bfb..d451c751b91 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,11 +20,11 @@ COMMON_DEPEND="swt? ( dev-java/swt:3.7 )"
 BDEPEND="app-arch/unzip"
 RDEPEND="
${COMMON_DEPEND}
-   >=virtual/jre-1.5
+   >=virtual/jre-1.8:*
 "
 DEPEND="
${COMMON_DEPEND}
-   >=virtual/jdk-1.5
+   >=virtual/jdk-1.8:*
 "
 
 S="${WORKDIR}"

[gentoo-commits] repo/gentoo:master commit in: dev-java/miglayout/

2020-09-19 Thread Sam James 
commit: f5c36ee126821cfb52c4693cac8b47bf89abd8f0
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 20 01:27:48 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 20 02:03:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c36ee1

dev-java/miglayout: port to EAPI 7

Closes: https://bugs.gentoo.org/741008
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 dev-java/miglayout/miglayout-4.0.ebuild | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/dev-java/miglayout/miglayout-4.0.ebuild 
b/dev-java/miglayout/miglayout-4.0.ebuild
index 95862c4d8e1..83297335bfb 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -16,17 +16,22 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="swt"
 
-COMMON_DEP="
-   swt? ( dev-java/swt:3.7 )"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
+COMMON_DEPEND="swt? ( dev-java/swt:3.7 )"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+   ${COMMON_DEPEND}
+   >=virtual/jre-1.5
+"
+DEPEND="
+   ${COMMON_DEPEND}
>=virtual/jdk-1.5
-   app-arch/unzip"
+"
 
 S="${WORKDIR}"
 
-java_prepare() {
+src_prepare() {
+   default
+
mv net/miginfocom/{demo,examples} . || die
mv demo/* examples || die