commit: c31fe1f1dd672d9dae0b639478037c24f2e9777b Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Wed Nov 8 12:35:08 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Nov 8 12:35:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31fe1f1
media-video/jubler: treeclean Bug: https://bugs.gentoo.org/914499 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> media-video/jubler/Manifest | 2 - media-video/jubler/files/7.0.3-helpme.patch | 13 --- media-video/jubler/jubler-5.1.ebuild | 71 ------------- media-video/jubler/jubler-7.0.3.ebuild | 151 ---------------------------- media-video/jubler/metadata.xml | 12 --- profiles/package.mask | 1 - 6 files changed, 250 deletions(-) diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest deleted file mode 100644 index 062d06115937..000000000000 --- a/media-video/jubler/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST jubler-5.1.tar.bz2 1815531 BLAKE2B 59f9c3c57b906a73e16b32841900ef16450758115d930e767bc4d63882ad2b8a35100a34057ab6bb353f4bea87cb4036e080d8d13a844ae4bfcae8bb361d5b18 SHA512 e2a0da737362a3c8dc12966aec1e9939291237fc714a586186b72daa16abf967c8fea8dac04fb191cb803aa11db20cf6d67468d2383f17f5c6114a643860acef -DIST jubler-7.0.3.tar.gz 24201905 BLAKE2B 9ac33ed8da3045944be32cc914aaa45ff0de3193aa1b699f144131f79a83c1932f1e74d730102c9227ef2a08a66efb1d50fb010cfc2e70c8678febd07eb1513d SHA512 a1c6b8a33439f0206378e2792748b06a163fd8083714f18ca57940422c8a8730369925c21f377eb42b8b91ffcae81d5f0219f4c9fee814f8a2f60b51e2356726 diff --git a/media-video/jubler/files/7.0.3-helpme.patch b/media-video/jubler/files/7.0.3-helpme.patch deleted file mode 100644 index ac0be65c5598..000000000000 --- a/media-video/jubler/files/7.0.3-helpme.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/modules/core/src/main/java/com/panayotis/jubler/os/SystemFileFinder.java -+++ b/modules/core/src/main/java/com/panayotis/jubler/os/SystemFileFinder.java -@@ -65,7 +65,9 @@ public class SystemFileFinder { - } - - private static boolean loadLibraryImpl(String name) { -- File libfile = findFile("lib" + File.separator + SystemDependent.mapLibraryName(name)); -+ System.out.println("SystemDependent.mapLibraryName is " + SystemDependent.mapLibraryName(name)); -+ File libfile = findFile(SystemDependent.mapLibraryName(name)); -+ System.out.println("libfile is " + libfile); - if (libfile != null) - try { - System.load(libfile.getAbsolutePath()); diff --git a/media-video/jubler/jubler-5.1.ebuild b/media-video/jubler/jubler-5.1.ebuild deleted file mode 100644 index d69368f42008..000000000000 --- a/media-video/jubler/jubler-5.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop java-pkg-2 java-ant-2 xdg - -MY_PN="${PN^}" - -DESCRIPTION="Java subtitle editor" -HOMEPAGE="https://www.jubler.org/"; -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-source-${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="mplayer spell nls" - -RDEPEND=" - mplayer? ( media-video/mplayer[libass] ) - spell? ( app-text/aspell ) - >=virtual/jre-1.6" - -DEPEND=" - >=virtual/jdk-1.6" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - default - - local REMOVE_PLUGINS=() _plugin - use mplayer || REMOVE_PLUGINS+=( mplayer ) - use spell || REMOVE_PLUGINS+=( aspell zemberek ) - for _plugin in "${REMOVE_PLUGINS[@]}"; do - rm -rv "plugins/${_plugin}" || die - done -} - -src_compile() { - local JUBLER_TARGETS=() - use nls || JUBLER_TARGETS+=( core help ) - eant -f "${S}/build.xml" "${JUBLER_TARGETS[@]}" -} - -src_install() { - DESTDIR="${D}" eant linuxdesktopintegration - rm -rv "${D}/usr/share/menu" || die - - doicon "resources/installers/linux/${PN}.png" - domenu "resources/installers/linux/${PN}.desktop" - - java-pkg_dojar dist/Jubler.jar - java-pkg_dolauncher "${PN}" --main Jubler - - if use nls; then - insinto "/usr/share/${PN}/lib/i18n/" - doins dist/i18n/*.jar - fi - - insinto "/usr/share/${PN}/lib/themes" - doins dist/themes/coretheme.jar - insinto "/usr/share/${PN}/lib/lib" - doins dist/lib/*.jar - - insinto "/usr/share/${PN}/help" - doins resources/help/* - - doman "resources/installers/linux/${PN}.1" - einstalldocs -} diff --git a/media-video/jubler/jubler-7.0.3.ebuild b/media-video/jubler/jubler-7.0.3.ebuild deleted file mode 100644 index 0b14f079e2b1..000000000000 --- a/media-video/jubler/jubler-7.0.3.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/teras/Jubler/archive/v7.0.3.tar.gz --slot 0 --keywords "~amd64" --ebuild jubler-7.0.3.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.panayotis.jubler:project:7.0.3" - -inherit desktop java-pkg-2 java-pkg-simple toolchain-funcs xdg-utils - -DESCRIPTION="Jubler Subtitle Εditor" -HOMEPAGE="https://www.jubler.org/"; -SRC_URI="https://github.com/teras/Jubler/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -CP_DEPEND="dev-java/appenh:0" - -DEPEND="${CP_DEPEND} - media-video/ffmpeg:0= - >=virtual/jdk-1.8:*" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -JUBLER_MODULES=( - "jubler" - "appenhancer" - "aspell" - "basetextsubs" - "coretools" - "mplayer" - "zemberek" -) - -HTML_DOCS=( ChangeLog.html ) - -PATCHES=( "${FILESDIR}/7.0.3-helpme.patch" ) - -S="${WORKDIR}/Jubler-${PV}" - -src_prepare() { - java-pkg-2_src_prepare - default - # decodeaudio.c:82:24: error: 'AVCODEC_MAX_AUDIO_FRAME_SIZE' undeclared (first use in this function); did you mean 'AV_CODEC_CAP_VARIABLE_FRAME_SIZE'? - # decodeaudio.c:176:49: error: 'CODEC_ID_NONE' undeclared (first use in this function); did you mean 'AV_CODEC_ID_NONE'? - # decodeaudio.c:180:38: error: 'AVCodecContext' has no member named 'request_channels'; did you mean 'request_channel_layout'? - # decodeframe.c:230:31: error: 'PIX_FMT_RGB24' undeclared (first use in this function); did you mean 'AV_PIX_FMT_RGB24'? - # decodeaudio.c:197:79: error: 'AVIO_WRONLY' undeclared (first use in this function # https://github.com/FFmpeg/FFmpeg/commit/59d96941f0 - # decodeaudio.c:239:26: error: 'AVCodecContext' has no member named 'request_channels'; did you mean 'request_channel_layout'? - # makecache.c:94:28: error: 'AVCODEC_MAX_AUDIO_FRAME_SIZE' undeclared (first use in this function); did you mean 'AV_CODEC_CAP_VARIABLE_FRAME_SIZE'? - # decodeaudio.c:339:25: error: 'CODEC_FLAG_GLOBAL_HEADER' undeclared (first use in this function); did you mean 'AV_CODEC_FLAG_GLOBAL_HEADER' - sed \ - -e 's:AVCODEC_MAX_AUDIO_FRAME_SIZE:AV_CODEC_CAP_VARIABLE_FRAME_SIZE:' \ - -e 's:CODEC_ID_NONE:AV_CODEC_ID_NONE:' \ - -e 's:request_channels:request_channel_layout:' \ - -e 's:PIX_FMT_RGB24:AV_PIX_FMT_RGB24:' \ - -e 's:AVIO_WRONLY:AVIO_FLAG_WRITE:' \ - -e 's:CODEC_FLAG_GLOBAL_HEADER:AV_CODEC_FLAG_GLOBAL_HEADER:' \ - -e 's:CodecID:AVCodecID:' \ - -i resources/ffmpeg/ffdecode/*.c || die -} - -src_compile() { - einfo "Compiling the ffdecode library" - pushd resources/ffmpeg/ffdecode || die - local args=( - JAVA_HOME="$(java-config -g JAVA_HOME)" - STATIC="no" - CC="$(tc-getCC)" - STRIP="$(tc-getSTRIP)" - LIBNAME="libffdecode.so" - ) - emake "${args[@]}" - popd - - jar -cf coretheme.jar -C modules/coretheme/src/main/resources/ . || die - JAVA_GENTOO_CLASSPATH_EXTRA+=":coretheme.jar" - - mv modules/{core,jubler} || die - - local module - for module in "${JUBLER_MODULES[@]}"; do - einfo "Compiling module \"${module}\"" - JAVA_SRC_DIR="modules/${module}/src/main/java" - JAVA_RESOURCE_DIRS="modules/${module}/src/main/resources" - JAVA_JAR_FILENAME="${module}.jar" - if [[ ${module} == jubler ]]; then - JAVA_MAIN_CLASS="Jubler" - fi - - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar" - JAVA_MAIN_CLASS="" - rm -r target || die - done - - if use doc; then - einfo "Compiling javadocs" - JAVA_SRC_DIR=() - for module in "${JUBLER_MODULES}"; do - JAVA_SRC_DIR+=( "modules/${module}/src/main/java" ) - done - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi -} - -src_install() { - java-pkg_doso dist/lib/libffdecode.so - java-pkg_dojar "coretheme.jar" - local module - for module in "${JUBLER_MODULES[@]}"; do - java-pkg_dojar ${module}.jar - if use source; then - java-pkg_dosrc "modules/${module}/src/main/java/*" - fi - done - - if use doc; then - java-pkg_dojavadoc target/api - fi - - java-pkg_dolauncher "jubler" --main Jubler - - domenu resources/installers/linux/jubler.desktop - doicon -s 32 resources/installers/linux/jubler32.png - doicon -s 64 resources/installers/linux/jubler64.png - doicon -s 128 resources/installers/linux/jubler128.png - doicon modules/jubler/src/main/resources/icons/splash.jpg - doicon -s 16 modules/jubler/src/main/resources/icons/crossmobile.png - - # modules/installer/pom.xml#L90-L94 - insinto /usr/share/${PN}/lib/i18n - doins -r resources/i18n/cache - insinto /usr/share/${PN}/lib/help - doins resources/help/{cache/jubler-faq.html,jubler-faq.xml,question.png} -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-video/jubler/metadata.xml b/media-video/jubler/metadata.xml deleted file mode 100644 index 206f60aebeb8..000000000000 --- a/media-video/jubler/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - </maintainer> - <upstream> - <bugs-to>https://github.com/teras/Jubler/issues</bugs-to> - <changelog>https://www.jubler.org/changelog.html</changelog> - <remote-id type="github">teras/Jubler</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index e31514c36d18..3477fc562360 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -332,7 +332,6 @@ sys-fs/dmg2img # Incompatible with newer media-video/ffmpeg, bug #914499. # Deps appenh and loadlib not used by anything else. # Removal on 2023-11-04. -media-video/jubler dev-java/appenh dev-java/loadlib
