public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2019-03-24 10:09 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2019-03-24 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a011264189a5df0842050557d03967c295a6ca51
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 10:09:46 2019 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 10:09:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0112641

media-tv/channeleditor: Revision bump to channeleditor-1.9.2.1-r2.

Switch to EAPI 7. Fix homepage.

Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 .../channeleditor/channeleditor-1.9.2.1-r2.ebuild  | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
new file mode 100644
index 00000000000..f4a7b466a0f
--- /dev/null
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE=source
+inherit desktop eutils java-pkg-2 java-ant-2 xdg
+
+DESCRIPTION="Editor for VDR channels.conf"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+PATCHES=(
+	# include localisation changes
+	"${FILESDIR}"/${P}-messages.properties.patch
+	"${FILESDIR}"/${P}-messages_en.properties.patch
+)
+
+S="${WORKDIR}/${PN}"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
+	|| die "reading Main-Class failed"
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# move files out of build and remove stuff not needed in the package
+	mv build/* "${S}" || die "cleaning build dir failed"
+	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
+		|| die "removing files failed"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
+		|| die "copying build.xml failed"
+
+	# convert CRLF to LF
+	edos2unix MANIFEST.MF
+}
+
+src_compile() {
+	eant build -Dmanifest.mainclass=$(mainclass)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher ${PN} --main $(mainclass)
+
+	use source && java-pkg_dosrc src
+
+	make_desktop_entry channeleditor Channeleditor "" "Utility"
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2019-04-07 13:14 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2019-04-07 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1c8b602ce19695ef0caa2188a03d8a4710df3c21
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 13:14:03 2019 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 13:14:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8b602c

media-tv/channeleditor: Fix homepage channeleditor-1.9.2.1-r1.

Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
index b3c5d9fc82b..f9060339843 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE=source
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Editor for VDR channels.conf"
-HOMEPAGE="http://www.renier.de/channeleditor"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2020-05-18 12:55 Agostino Sarubbo
  0 siblings, 0 replies; 16+ messages in thread
From: Agostino Sarubbo @ 2020-05-18 12:55 UTC (permalink / raw
  To: gentoo-commits

commit:     90ced2c484fe09a138d973e1f29655903cbc8645
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 12:55:40 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 18 12:55:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ced2c4

media-tv/channeleditor: amd64 stable wrt bug #723360

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
index f4a7b466a0f..eecb1847cbb 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2020-05-18 13:02 Agostino Sarubbo
  0 siblings, 0 replies; 16+ messages in thread
From: Agostino Sarubbo @ 2020-05-18 13:02 UTC (permalink / raw
  To: gentoo-commits

commit:     f749b0886daed1cab8810942572c6e1ccac4dae8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 13:02:43 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 18 13:02:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f749b088

media-tv/channeleditor: x86 stable wrt bug #723360

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
index eecb1847cbb..587e3271b49 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2020-06-09 11:49 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2020-06-09 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8734c3138967d3aeb07026f99692d5d4e0d344b1
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 11:49:37 2020 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 11:49:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8734c313

media-tv/channeleditor: Remove old channeleditor-1.9.2.1-r1.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../channeleditor/channeleditor-1.9.2.1-r1.ebuild  | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
deleted file mode 100644
index f9060339843..00000000000
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE=source
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Editor for VDR channels.conf"
-HOMEPAGE="https://sites.google.com/site/reniershomepage/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=" >=virtual/jdk-1.5"
-
-S="${WORKDIR}/${PN}"
-
-mainclass() {
-	# read Main-Class from MANIFEST.MF
-	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
-	|| die "reading Main-Class failed"
-}
-
-java_prepare() {
-	# move files out of build and remove stuff not needed in the package
-	mv build/* "${S}" || die "cleaning build dir failed"
-	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
-		|| die "removing files failed"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
-		|| die "copying build.xml failed"
-
-	# convert CRLF to LF
-	edos2unix MANIFEST.MF
-
-	# include localisation changes
-	epatch "${FILESDIR}"/${P}-messages.properties.patch
-	epatch "${FILESDIR}"/${P}-messages_en.properties.patch
-}
-
-src_compile() {
-	eant build -Dmanifest.mainclass=$(mainclass)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher ${PN} --main $(mainclass)
-
-	use source && java-pkg_dosrc src
-
-	make_desktop_entry channeleditor Channeleditor "" "Utility"
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2021-04-17 17:45 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2021-04-17 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     0e55f97b03dfc27345ac6916ea5e4167285ef92f
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 17:44:50 2021 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 17:44:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e55f97b

media-tv/channeleditor: Bump java virtuals to 1.8.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../channeleditor/channeleditor-1.9.2.1-r3.ebuild  | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
new file mode 100644
index 00000000000..e3ec1016567
--- /dev/null
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.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=source
+inherit desktop eutils java-pkg-2 java-ant-2 xdg
+
+DESCRIPTION="Editor for VDR channels.conf"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+	# include localisation changes
+	"${FILESDIR}"/${P}-messages.properties.patch
+	"${FILESDIR}"/${P}-messages_en.properties.patch
+)
+
+S="${WORKDIR}/${PN}"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
+	|| die "reading Main-Class failed"
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# move files out of build and remove stuff not needed in the package
+	mv build/* "${S}" || die "cleaning build dir failed"
+	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
+		|| die "removing files failed"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
+		|| die "copying build.xml failed"
+
+	# convert CRLF to LF
+	edos2unix MANIFEST.MF
+}
+
+src_compile() {
+	eant build -Dmanifest.mainclass=$(mainclass)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher ${PN} --main $(mainclass)
+
+	use source && java-pkg_dosrc src
+
+	make_desktop_entry channeleditor Channeleditor "" "Utility"
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2021-04-23 18:34 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2021-04-23 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     43fb0e4e06987769c56cc8df76d83c4251f583a9
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 18:34:01 2021 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 18:34:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fb0e4e

media-tv/channeleditor: eutils->edos2unix

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
index e3ec1016567..684ff24bffb 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE=source
-inherit desktop eutils java-pkg-2 java-ant-2 xdg
+inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
 
 DESCRIPTION="Editor for VDR channels.conf"
 HOMEPAGE="https://sites.google.com/site/reniershomepage/"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2021-08-10  6:41 Agostino Sarubbo
  0 siblings, 0 replies; 16+ messages in thread
From: Agostino Sarubbo @ 2021-08-10  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6426ceb93b6132a5a57a50a56304304a89133447
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 06:40:59 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 06:40:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6426ceb9

media-tv/channeleditor: amd64 stable wrt bug #795978

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

 media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
index 684ff24bffb..e648beb2140 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2021-08-19  1:08 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-08-19  1:08 UTC (permalink / raw
  To: gentoo-commits

commit:     8cf09d2389e7c61fbba74ea7655a42b9fefbce8d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 01:07:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 01:07:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf09d23

media-tv/channeleditor: Stabilize 1.9.2.1-r3 x86, #795978

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
index e648beb2140..24336334fa6 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2021-08-19 18:05 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2021-08-19 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c12d3f8a062c3849078f94c592daba9bcacccf25
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 18:04:49 2021 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 18:05:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12d3f8a

media-tv/channeleditor: Remove old.

Closes: https://bugs.gentoo.org/787443
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../channeleditor/channeleditor-1.9.2.1-r2.ebuild  | 64 ----------------------
 1 file changed, 64 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
deleted file mode 100644
index 4605bec42ea..00000000000
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE=source
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
-
-DESCRIPTION="Editor for VDR channels.conf"
-HOMEPAGE="https://sites.google.com/site/reniershomepage/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-PATCHES=(
-	# include localisation changes
-	"${FILESDIR}"/${P}-messages.properties.patch
-	"${FILESDIR}"/${P}-messages_en.properties.patch
-)
-
-S="${WORKDIR}/${PN}"
-
-mainclass() {
-	# read Main-Class from MANIFEST.MF
-	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
-	|| die "reading Main-Class failed"
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# move files out of build and remove stuff not needed in the package
-	mv build/* "${S}" || die "cleaning build dir failed"
-	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
-		|| die "removing files failed"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
-		|| die "copying build.xml failed"
-
-	# convert CRLF to LF
-	edos2unix MANIFEST.MF
-}
-
-src_compile() {
-	eant build -Dmanifest.mainclass=$(mainclass)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher ${PN} --main $(mainclass)
-
-	use source && java-pkg_dosrc src
-
-	make_desktop_entry channeleditor Channeleditor "" "Utility"
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2024-03-08 14:43 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2024-03-08 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     8c54602e739f27a59e4b828f125a52235740aa58
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 14:42:51 2024 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 14:42:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c54602e

media-tv/channeleditor: update HOMEPAGE, SRC_URI

Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
index 24336334fa66..fc1daa0f52d5 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,13 +7,12 @@ JAVA_PKG_IUSE=source
 inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
 
 DESCRIPTION="Editor for VDR channels.conf"
-HOMEPAGE="https://sites.google.com/site/reniershomepage/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/channeleditor"
+SRC_URI="mirror://sourceforge/project/channeleditor/channeleditor/$(ver_cut 1-3)/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2024-05-04  9:51 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2024-05-04  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     eb34db8a0b021462708baa70958b1703ebecb7a0
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 09:50:20 2024 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat May  4 09:50:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb34db8a

media-tv/channeleditor: fix variable order

Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
index 7cbfc8c600d0..366dd6d32357 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Editor for VDR channels.conf"
 HOMEPAGE="https://sites.google.com/site/reniershomepage/channeleditor"
 SRC_URI="https://downloads.sourceforge.net/project/channeleditor/channeleditor/$(ver_cut 1-3)/${P/-/_}_src.tar.gz"
 
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -23,8 +25,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-messages_en.properties.patch
 )
 
-S="${WORKDIR}/${PN}"
-
 mainclass() {
 	# read Main-Class from MANIFEST.MF
 	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2024-05-08 21:22 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2024-05-08 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5ef609d661b55c73ebd347ffbd034cc809b0cf2b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May  5 11:32:34 2024 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed May  8 21:21:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ef609d6

media-tv/channeleditor: update EAPI 7 -> 8

- Switches to java-pkg-simple
- No longer needs build.xml nor depends on ant
- Drops java-ant-2.eclass, edos2unix.eclass
- Uses the JAVA_MAIN_CLASS eclass variable for launchers

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../channeleditor/channeleditor-1.9.2.1-r4.ebuild  | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
new file mode 100644
index 000000000000..e09a7fe8c5d0
--- /dev/null
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg
+
+DESCRIPTION="Editor for VDR channels.conf"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/channeleditor"
+SRC_URI="https://downloads.sourceforge.net/project/channeleditor/channeleditor/$(ver_cut 1-3)/${P/-/_}_src.tar.gz"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+	# include localisation changes
+	"${FILESDIR}"/${P}-messages.properties.patch
+	"${FILESDIR}"/${P}-messages_en.properties.patch
+)
+
+JAVA_RESOURCE_DIRS="resources/src/java"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	xdg_environment_reset
+
+	JAVA_MAIN_CLASS="$(grep Main build/MANIFEST.MF | cut -d' ' -f2 | tr -cd [:print:])"
+
+	# java-pkg-simple expects resources in JAVA_RESOURCE_DIRS
+	mkdir -p resources || die
+	find src -type f ! -name '*.java' \
+		! -name 'README' ! -name 'COPYRIGHT' \
+		| xargs cp --parent -t resources || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	make_desktop_entry channeleditor Channeleditor "" "Utility"
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2024-06-07  5:14 Arthur Zamarin
  0 siblings, 0 replies; 16+ messages in thread
From: Arthur Zamarin @ 2024-06-07  5:14 UTC (permalink / raw
  To: gentoo-commits

commit:     7916487859e93a7c28f2518974781b1e4d04635b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 05:14:40 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 05:14:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79164878

media-tv/channeleditor: Stabilize 1.9.2.1-r4 amd64, #933667

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
index 5b66aceb4e55..47ea0cf6035b 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2024-06-07  5:14 Arthur Zamarin
  0 siblings, 0 replies; 16+ messages in thread
From: Arthur Zamarin @ 2024-06-07  5:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0df03a8507f280604240baaffa6a0020a6cf04d0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 05:14:39 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 05:14:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df03a85

media-tv/channeleditor: Stabilize 1.9.2.1-r4 x86, #933667

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
index e09a7fe8c5d0..5b66aceb4e55 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/
@ 2024-06-07 16:21 Daniel Pielmeier
  0 siblings, 0 replies; 16+ messages in thread
From: Daniel Pielmeier @ 2024-06-07 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     82f544ef8acd123a95f3b854e408cf16653f60c6
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 16:20:46 2024 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 16:21:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f544ef

media-tv/channeleditor: drop 1.9.2.1-r3

Closes: https://bugs.gentoo.org/933668
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 .../channeleditor/channeleditor-1.9.2.1-r3.ebuild  | 63 ----------------------
 1 file changed, 63 deletions(-)

diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
deleted file mode 100644
index 366dd6d32357..000000000000
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE=source
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
-
-DESCRIPTION="Editor for VDR channels.conf"
-HOMEPAGE="https://sites.google.com/site/reniershomepage/channeleditor"
-SRC_URI="https://downloads.sourceforge.net/project/channeleditor/channeleditor/$(ver_cut 1-3)/${P/-/_}_src.tar.gz"
-
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-PATCHES=(
-	# include localisation changes
-	"${FILESDIR}"/${P}-messages.properties.patch
-	"${FILESDIR}"/${P}-messages_en.properties.patch
-)
-
-mainclass() {
-	# read Main-Class from MANIFEST.MF
-	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
-	|| die "reading Main-Class failed"
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# move files out of build and remove stuff not needed in the package
-	mv build/* "${S}" || die "cleaning build dir failed"
-	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
-		|| die "removing files failed"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
-		|| die "copying build.xml failed"
-
-	# convert CRLF to LF
-	edos2unix MANIFEST.MF
-}
-
-src_compile() {
-	eant build -Dmanifest.mainclass=$(mainclass)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher ${PN} --main $(mainclass)
-
-	use source && java-pkg_dosrc src
-
-	make_desktop_entry channeleditor Channeleditor "" "Utility"
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2024-06-07 16:22 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-19 18:05 [gentoo-commits] repo/gentoo:master commit in: media-tv/channeleditor/ Daniel Pielmeier
  -- strict thread matches above, loose matches on Subject: below --
2024-06-07 16:21 Daniel Pielmeier
2024-06-07  5:14 Arthur Zamarin
2024-06-07  5:14 Arthur Zamarin
2024-05-08 21:22 Daniel Pielmeier
2024-05-04  9:51 Daniel Pielmeier
2024-03-08 14:43 Daniel Pielmeier
2021-08-19  1:08 Sam James
2021-08-10  6:41 Agostino Sarubbo
2021-04-23 18:34 Daniel Pielmeier
2021-04-17 17:45 Daniel Pielmeier
2020-06-09 11:49 Daniel Pielmeier
2020-05-18 13:02 Agostino Sarubbo
2020-05-18 12:55 Agostino Sarubbo
2019-04-07 13:14 Daniel Pielmeier
2019-03-24 10:09 Daniel Pielmeier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox