diff options
Diffstat (limited to 'app-cdr')
156 files changed, 1286 insertions, 1886 deletions
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild index 2257660d9dfa..93024872c4d1 100644 --- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild +++ b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Convert CD images from b5i (BlindWrite) to iso" HOMEPAGE="https://web.archive.org/web/20100116120705/b5i2iso.berlios.de" SRC_URI="mirror://gentoo/${P}.tar.bz2" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" -PATCHES=( "${FILESDIR}/${P}-segfault.patch" ) -S=${WORKDIR}/${PN} +PATCHES=( "${FILESDIR}"/${P}-segfault.patch ) src_compile() { - $(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN} + tc-export CC + emake -C src b5i2iso } src_install() { - dobin ${PN} + dobin src/b5i2iso } diff --git a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch b/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch index 6fda80e79605..1863ca42afee 100644 --- a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch +++ b/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch @@ -1,5 +1,5 @@ ---- b5i2iso/src/b5i2iso.c -+++ b5i2iso/src/b5i2iso.c +--- a/src/b5i2iso.c ++++ b/src/b5i2iso.c @@ -1,3 +1,4 @@ +#include <errno.h> #include <stdio.h> @@ -15,4 +15,4 @@ +} fdest = fopen(destfilename,"wb"); - fseek(fsource, 2352, SEEK_CUR);
\ No newline at end of file + fseek(fsource, 2352, SEEK_CUR); diff --git a/app-cdr/b5i2iso/metadata.xml b/app-cdr/b5i2iso/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/app-cdr/b5i2iso/metadata.xml +++ b/app-cdr/b5i2iso/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/bashburn/metadata.xml b/app-cdr/bashburn/metadata.xml index e161172ddfdb..4ecbea4788d3 100644 --- a/app-cdr/bashburn/metadata.xml +++ b/app-cdr/bashburn/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> @@ -12,5 +12,6 @@ <name>Anders Lindén</name> </maintainer> <doc lang="en">http://bashburn.dose.se/index.php?s=docs</doc> + <remote-id type="gitlab">anders.linden/BashBurn</remote-id> </upstream> </pkgmetadata> diff --git a/app-cdr/bchunk/bchunk-1.2.2.ebuild b/app-cdr/bchunk/bchunk-1.2.2-r1.ebuild index 670347ecf25e..464109766dd3 100644 --- a/app-cdr/bchunk/bchunk-1.2.2.ebuild +++ b/app-cdr/bchunk/bchunk-1.2.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -11,9 +11,7 @@ SRC_URI="http://he.fi/bchunk/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" - -DOCS=( "${PN}.spec" README ChangeLog ) +KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" src_compile() { emake \ @@ -23,7 +21,8 @@ src_compile() { } src_install() { - dobin "${PN}" - doman "${PN}.1" + dobin bchunk + doman bchunk.1 einstalldocs + dodoc bchunk.spec } diff --git a/app-cdr/bchunk/metadata.xml b/app-cdr/bchunk/metadata.xml index 8bf4f7c7550d..49cf30778add 100644 --- a/app-cdr/bchunk/metadata.xml +++ b/app-cdr/bchunk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>alexey+gentoo@asokolov.org</email> diff --git a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild index 4abbf52bf1c3..3a14eccc6f75 100644 --- a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild +++ b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild @@ -1,28 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="converts RAW format (.bin/.cue) files to ISO/WAV format" HOMEPAGE="http://users.andara.com/~doiron/bin2iso/" SRC_URI="mirror://gentoo/${P}.tar.bz2" +S="${WORKDIR}/${PN}" LICENSE="public-domain" SLOT="0" KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" -S=${WORKDIR}/${PN} - -PATCHES=( "${FILESDIR}"/${P}-sanity-checks.patch ) +PATCHES=( + "${FILESDIR}"/${P}-sanity-checks.patch + "${FILESDIR}"/${P}-fixes.patch +) src_compile() { - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} bin2iso19b_linux.c -o ${PN} || die "compile failed" + tc-export CC + emake bin2iso19b_linux } src_install() { - dobin ${PN} + newbin bin2iso19b_linux bin2iso dodoc readme.txt } diff --git a/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch b/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch new file mode 100644 index 000000000000..fc28945ea990 --- /dev/null +++ b/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch @@ -0,0 +1,24 @@ +--- a/bin2iso19b_linux.c ++++ b/bin2iso19b_linux.c +@@ -1,6 +1,12 @@ ++#ifndef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#endif
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
+
+ #define DEBUG 0
+ #define CHECK 0 /* don't bother checking bin for validity... */
+@@ -111,7 +117,7 @@ + unsigned long size; /* track size in bytes */
+ } tTrack;
+
+-buffered_fread(unsigned char *array, unsigned int size) {
++int buffered_fread(unsigned char *array, unsigned int size) {
+ unsigned int i;
+
+ if(INBUF_WIDX == 0) {
diff --git a/app-cdr/bin2iso/metadata.xml b/app-cdr/bin2iso/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/bin2iso/metadata.xml +++ b/app-cdr/bin2iso/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest index 6919842a6d8b..62d482d51e24 100644 --- a/app-cdr/brasero/Manifest +++ b/app-cdr/brasero/Manifest @@ -1 +1 @@ -DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f +DIST brasero-3.12.3.tar.xz 3156012 BLAKE2B e657f29719164b786e29a4974102cf6b0eb3316bec84a08838bd62b952c43994e0187f6cfeaa5080fa794b1ff1684553a3d643cd309b2957a8d4191c7ea8cfbf SHA512 0e3c97b2a754f7178207db390e33b832fcaed3856ae5dee447e5c26d712728302dbebbf839a4fb7565f63b3ebb1e4936e20739482a8114e6fe2700805659270a diff --git a/app-cdr/brasero/brasero-3.12.2-r3.ebuild b/app-cdr/brasero/brasero-3.12.3.ebuild index a8a6915a00c1..ad5a76453344 100644 --- a/app-cdr/brasero/brasero-3.12.2-r3.ebuild +++ b/app-cdr/brasero/brasero-3.12.3.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" inherit gnome2 @@ -12,9 +11,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero" LICENSE="GPL-2+ CC-BY-SA-3.0" SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3 -IUSE="+css +introspection +libburn mp3 nautilus playlist test tracker" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="+css +introspection +libburn mp3 nautilus playlist tracker" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" DEPEND=" >=dev-libs/glib-2.29.14:2 @@ -50,19 +48,15 @@ RDEPEND="${DEPEND} BDEPEND=" >=dev-util/intltool-0.50 dev-util/itstool - >=dev-util/gtk-doc-am-1.12 + >=dev-build/gtk-doc-am-1.12 sys-devel/gettext virtual/pkgconfig - test? ( app-text/docbook-xml-dtd:4.3 ) - app-text/yelp-tools - gnome-base/gnome-common " -PDEPEND="gnome-base/gvfs" +# eautoreconf deps +# app-text/yelp-tools +# gnome-base/gnome-common -PATCHES=( - # https://gitlab.gnome.org/GNOME/brasero/-/merge_requests/10 - "${FILESDIR}"/${P}-tracker3.patch -) +PDEPEND="gnome-base/gvfs" src_configure() { gnome2_src_configure \ @@ -77,8 +71,3 @@ src_configure() { $(use_enable playlist) \ $(use_enable tracker search) } - -src_install() { - gnome2_src_install - mv "${ED}"/usr/share/{appdata,metainfo} || die -} diff --git a/app-cdr/brasero/files/brasero-3.12.2-tracker3.patch b/app-cdr/brasero/files/brasero-3.12.2-tracker3.patch deleted file mode 100644 index 7a98f336cc14..000000000000 --- a/app-cdr/brasero/files/brasero-3.12.2-tracker3.patch +++ /dev/null @@ -1,240 +0,0 @@ -From ca0d487aac3b9cf21e520a00b94cb3eaf833b9a3 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Thu, 24 Dec 2020 12:19:49 +0100 -Subject: [PATCH 1/5] Obtain TrackerSparqlConnection in a single point - -The is_available vmethod tries to create a connection if it's not -there. But the BraseroSearchTracker initialization already tries to -obtain the SPARQL connection. Let this method return wether -initialiation was successful. ---- - src/brasero-search-tracker.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c -index fe7be2bd..f8c29c0d 100644 ---- a/src/brasero-search-tracker.c -+++ b/src/brasero-search-tracker.c -@@ -56,12 +56,6 @@ brasero_search_tracker_is_available (BraseroSearchEngine *engine) - BraseroSearchTrackerPrivate *priv; - - priv = BRASERO_SEARCH_TRACKER_PRIVATE (engine); -- GError *error = NULL; -- if (priv->connection) -- return TRUE; -- -- priv->cancellable = g_cancellable_new (); -- priv->connection = tracker_sparql_connection_get (priv->cancellable, &error); - return (priv->connection != NULL); - } - --- -GitLab - - -From c0dace005ec34b345845aacd1f929fd618b199af Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Thu, 24 Dec 2020 12:37:13 +0100 -Subject: [PATCH 2/5] Fix ORDER BY clauses in Tracker search - -The ?urn variable is not defined anywhere else in the query, so -ordering is left undefined. Access the url/filename properly here. ---- - src/brasero-search-tracker.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c -index f8c29c0d..94085070 100644 ---- a/src/brasero-search-tracker.c -+++ b/src/brasero-search-tracker.c -@@ -307,7 +307,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search, - g_string_append (query, ")"); - - g_string_append (query, -- "} ORDER BY DESC(nie:url(?urn)) DESC(nfo:fileName(?urn))"); -+ "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))"); - - tracker_sparql_connection_query_async (priv->connection, - query->str, --- -GitLab - - -From f7181445bf9c88b7fab1bb5237d602b491694a9e Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Thu, 24 Dec 2020 13:04:03 +0100 -Subject: [PATCH 3/5] Only use fts:rank with FTS searches - -This fixes two things: -- The use of fts:match depends on priv->keywords being set, but - fts:rank() has undefined behavior if fts:match is not present. - Its value is returned in the cursor, but fortunately unused, - so it can go away. - -- Fixes "garbage" being added at the end of the query, concretely - ") } ORDER BY ... " is appended at the supposed end of the query - string. Older SPARQL parser implementations would allow garbage - at the end of its parsing state, I suspect "LIMIT 0 OFFSET 10000" - was just a mean to push it to that state that it'd allow the - remaining string, so that is gone too. ---- - src/brasero-search-tracker.c | 21 +++++++++------------ - 1 file changed, 9 insertions(+), 12 deletions(-) - -diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c -index 94085070..ae1d388a 100644 ---- a/src/brasero-search-tracker.c -+++ b/src/brasero-search-tracker.c -@@ -234,7 +234,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search, - - priv = BRASERO_SEARCH_TRACKER_PRIVATE (search); - -- query = g_string_new ("SELECT ?file ?url ?mime fts:rank(?file) " /* Which variables should be returned */ -+ query = g_string_new ("SELECT ?file ?url ?mime " /* Which variables should be returned */ - "WHERE {" /* Start defining the search and its scope */ - " ?file a nfo:FileDataObject . " /* File must be a file (not a stream, ...) */ - " ?file nie:url ?url . " /* Get the url of the file */ -@@ -293,21 +293,18 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search, - " ) "); - } - -- if (priv->keywords) -+ if (priv->keywords) { - g_string_append_printf (query, - " ?file fts:match \"%s\" ", /* File must match possible keywords */ - priv->keywords); - -- g_string_append (query, -- " } " -- "ORDER BY ASC(fts:rank(?file)) " -- "OFFSET 0 " -- "LIMIT 10000"); -- -- g_string_append (query, ")"); -- -- g_string_append (query, -- "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))"); -+ g_string_append (query, -+ " } " -+ "ORDER BY ASC(fts:rank(?file))"); -+ } else { -+ g_string_append (query, -+ "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))"); -+ } - - tracker_sparql_connection_query_async (priv->connection, - query->str, --- -GitLab - - -From ede7758e2fae487d57be641a120c4c02bfd249f1 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Thu, 24 Dec 2020 13:15:21 +0100 -Subject: [PATCH 4/5] Observe nfo:FileDataObject/nie:InformationElement split - -These resources are interpreted differently in Tracker 3.0 compared -to older versions, the newer version makes those 2 different resources -(one representing the "file", other the "content) that relate to each -other. In older tracker versions, these 2 aspects were conflated in -a single resource. - -The query is implicitly crossing that barrier, so make it explicit. -With this change, the query may run with either version. ---- - src/brasero-search-tracker.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c -index ae1d388a..9aa06289 100644 ---- a/src/brasero-search-tracker.c -+++ b/src/brasero-search-tracker.c -@@ -238,7 +238,8 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search, - "WHERE {" /* Start defining the search and its scope */ - " ?file a nfo:FileDataObject . " /* File must be a file (not a stream, ...) */ - " ?file nie:url ?url . " /* Get the url of the file */ -- " ?file nie:mimeType ?mime . "); /* Get its mime */ -+ " ?file nie:mimeType ?mime . " /* Get its mime */ -+ " ?content nie:isStoredAs ?file . "); /* Get the resource representing the content */ - - if (priv->mimes) { - int i; -@@ -259,7 +260,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search, - gboolean param_added = FALSE; - - g_string_append (query, -- " ?file a ?type . " -+ " ?content a ?type . " - " FILTER ( "); - - if (priv->scope & BRASERO_SEARCH_SCOPE_MUSIC) { --- -GitLab - - -From 05589be7da3a0dfb00617df049d129abba703c36 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Thu, 24 Dec 2020 13:22:43 +0100 -Subject: [PATCH 5/5] Support Tracker 3.0 - -Add the compile-time checks, and add the minimal code catering for -the API changes. In 3.0 connections are no longer singletons. ---- - configure.ac | 6 +++++- - src/brasero-search-tracker.c | 8 ++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d0c7a870..96afc551 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -388,7 +388,7 @@ AC_ARG_ENABLE(search, - if test x"$enable_search" != "xno"; then - # Try to figure out the tracker API version to use - tracker_api="0.10" -- m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0]], -+ m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0], [3.0]], - [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED], - [tracker_api="VERSION"]) - ]) -@@ -408,6 +408,10 @@ if test x"$enable_search" = "xyes"; then - AC_SUBST(BRASERO_SEARCH_LIBS) - build_tracker="yes" - build_search="yes" -+ -+ if test x"$tracker_api" = x"3.0"; then -+ AC_DEFINE(HAVE_TRACKER3, 1, [define if tracker3 is available]) -+ fi - else - build_search="no" - fi -diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c -index 9aa06289..40c5f1ac 100644 ---- a/src/brasero-search-tracker.c -+++ b/src/brasero-search-tracker.c -@@ -17,6 +17,8 @@ - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include "config.h" -+ - #include <stdlib.h> - - #include <libtracker-sparql/tracker-sparql.h> -@@ -444,7 +446,13 @@ brasero_search_tracker_init (BraseroSearchTracker *object) - - priv = BRASERO_SEARCH_TRACKER_PRIVATE (object); - priv->cancellable = g_cancellable_new (); -+ -+#ifdef HAVE_TRACKER3 -+ priv->connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files", -+ NULL, NULL, &error); -+#else - priv->connection = tracker_sparql_connection_get (priv->cancellable, &error); -+#endif - - if (error) { - g_warning ("Could not establish a connection to Tracker: %s", error->message); --- -GitLab - diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml index c7162b317b58..670cc5b16e45 100644 --- a/app-cdr/brasero/metadata.xml +++ b/app-cdr/brasero/metadata.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg> - extension</flag> - <flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag> - <flag name="playlist">Enable support for playlists through - <pkg>dev-libs/totem-pl-parser</pkg></flag> - <flag name="tracker">Enable audio playlist search using the - <pkg>app-misc/tracker</pkg> indexer</flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg> extension</flag> + <flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag> + <flag name="playlist">Enable support for playlists through <pkg>dev-libs/totem-pl-parser</pkg></flag> + <flag name="tracker">Enable audio playlist search using the <pkg>app-misc/tracker</pkg> indexer</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/brasero</remote-id> + </upstream> </pkgmetadata> diff --git a/app-cdr/burncdda/burncdda-1.8.3-r1.ebuild b/app-cdr/burncdda/burncdda-1.8.3-r1.ebuild index 04e50b6400c3..5f0adc30778c 100644 --- a/app-cdr/burncdda/burncdda-1.8.3-r1.ebuild +++ b/app-cdr/burncdda/burncdda-1.8.3-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Console app for copying burning audio cds" -HOMEPAGE="http://burncdda.sourceforge.net/" +HOMEPAGE="https://burncdda.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/app-cdr/burncdda/metadata.xml b/app-cdr/burncdda/metadata.xml index df685cf32f90..bf3556de35c2 100644 --- a/app-cdr/burncdda/metadata.xml +++ b/app-cdr/burncdda/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> -<longdescription> - burnCDDA is a console frontend to cdrdao, cdrecord, mpg123, oggdec, mppdec, - flac, normalize, and mp3_check. It can be used to create audio CDs from an - M3U playlist (the playlist format of XMMS and amaroK). It supports MP3, OGG - Vorbis, Musepack, FLAC, and WAV files, and it might be the easiest way to - copy an audio CD. -</longdescription> + <longdescription> + burnCDDA is a console frontend to cdrdao, cdrecord, mpg123, oggdec, mppdec, + flac, normalize, and mp3_check. It can be used to create audio CDs from an + M3U playlist (the playlist format of XMMS and amaroK). It supports MP3, OGG + Vorbis, Musepack, FLAC, and WAV files, and it might be the easiest way to + copy an audio CD. + </longdescription> + <upstream> + <remote-id type="sourceforge">burncdda</remote-id> + </upstream> </pkgmetadata> diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3-r1.ebuild index 27a136490d28..f042a0804d2b 100644 --- a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild +++ b/app-cdr/ccd2iso/ccd2iso-0.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 DESCRIPTION="Convert CD images from ccd (CloneCD) to iso" HOMEPAGE="https://sourceforge.net/projects/ccd2iso/" @@ -9,10 +9,6 @@ SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -PATCHES=( "${FILESDIR}/${P}-headers.patch" ) +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog NEWS README TODO -} +PATCHES=( "${FILESDIR}"/${P}-headers.patch ) diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml index 4847a8764d48..1bc8dcd11a29 100644 --- a/app-cdr/ccd2iso/metadata.xml +++ b/app-cdr/ccd2iso/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!--maintainer-needed--> -<upstream> - <remote-id type="sourceforge">ccd2iso</remote-id> -</upstream> + <!--maintainer-needed--> + <upstream> + <remote-id type="sourceforge">ccd2iso</remote-id> + </upstream> </pkgmetadata> diff --git a/app-cdr/cdck/cdck-0.7.0-r2.ebuild b/app-cdr/cdck/cdck-0.7.0-r3.ebuild index cfbbfbbd6480..ca0805885897 100644 --- a/app-cdr/cdck/cdck-0.7.0-r2.ebuild +++ b/app-cdr/cdck/cdck-0.7.0-r3.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality" HOMEPAGE="http://swaj.net/unix/index.html#cdck" @@ -10,21 +12,21 @@ SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-man.patch + "${FILESDIR}"/${P}-wording.patch + "${FILESDIR}"/${P}-automake.patch + "${FILESDIR}"/${P}-cross.patch + "${FILESDIR}"/${P}-gcc-10.patch +) src_prepare() { default - - sed -e '1d' -i man/cdck_man.in || die "sed failed" -} - -src_configure() { - econf --disable-shared + eautoreconf } src_install() { default - - dobin src/cdck - doman man/cdck.1 + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/app-cdr/cdck/files/cdck-0.7.0-automake.patch b/app-cdr/cdck/files/cdck-0.7.0-automake.patch new file mode 100644 index 000000000000..629b48d8b4a4 --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-automake.patch @@ -0,0 +1,42 @@ +Description: allow libtool to auto(re)conf +Origin: vendor +Forwarded: no +Author: tony mancill <tmancill@debian.org> +Last-Update: 2015-03-04 + +--- a/configure.ac ++++ b/configure.ac +@@ -16,7 +16,6 @@ + + AC_SYS_LARGEFILE + +-AC_DISABLE_SHARED + AM_PROG_LIBTOOL + AC_SUBST(LIBTOOL_DEPS) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -10,12 +10,12 @@ CLEANFILES = *~ *.o *.la *.lo *.a + EXTRA_DIST = config.h cdck template.plot template-ps.plot + + INCLUDES = @CPPFLAGS@ +-CFLAGS = @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\" ++AM_CFLAGS = @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\" + + CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + + lib_LTLIBRARIES = libcdck.la +-noinst_LIBRARIES = libcdck.a ++#noinst_LIBRARIES = libcdck.a + + LIBCDCK_SRCS = \ + lib_main.cpp \ +@@ -28,7 +28,7 @@ LIBCDCK_SRCS = \ + lib_cdinfo.h + + libcdck_la_SOURCES = $(LIBCDCK_SRCS) +-libcdck_a_SOURCES = $(LIBCDCK_SRCS) ++#libcdck_a_SOURCES = $(LIBCDCK_SRCS) + + bin_PROGRAMS = cdck + diff --git a/app-cdr/cdck/files/cdck-0.7.0-cross.patch b/app-cdr/cdck/files/cdck-0.7.0-cross.patch new file mode 100644 index 000000000000..dae65e604898 --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-cross.patch @@ -0,0 +1,20 @@ +Description: replace hard-coded `gcc' with $CC in configure.ac + to allow cross-building. +Origin: vendor +Bug-Debian: https://bugs.debian.org/901177 +Forwarded: not-yet +Author: Helmut Grohne <helmut@subdivi.de> +Reviewed-by: gregor herrmann <gregoa@debian.org> +Last-Update: 2018-06-09 + +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,7 @@ + CXXFLAGS="$CXXFLAGS -Wall -Wwrite-strings -Woverloaded-virtual -fno-exceptions -fno-rtti -export-dynamic " + fi + +-SUPCXX=`gcc -print-file-name=libsupc++.a` ++SUPCXX=`$CC -print-file-name=libsupc++.a` + + LIBS="$SUPCXX $LIBS" + diff --git a/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch new file mode 100644 index 000000000000..145503096b0b --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch @@ -0,0 +1,18 @@ +Description: Fix detection of gcc version. + Use numeric instead of string comparison, then gcc version 10 is greater then 3. +Origin: vendor +Bug-Debian: https://bugs.debian.org/957073 +Author: gregor herrmann <gregoa@debian.org> +Last-Update: 2020-04-17 + +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,7 @@ + echo $_echo_n "checking version of ${CC} ... $_echo_c" + exec 15> ./.gcc.test + cat >&15 <<EOF +-${CC} -v 2>&1 | perl -e '\$/=undef;\$_=<STDIN>;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ gt 300); exit -1' ++${CC} -v 2>&1 | perl -e '\$/=undef;\$_=<STDIN>;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ >= 300); exit -1' + EOF + sh ./.gcc.test 2>/dev/null + if test $? -ne 0 ; then diff --git a/app-cdr/cdck/files/cdck-0.7.0-man.patch b/app-cdr/cdck/files/cdck-0.7.0-man.patch new file mode 100644 index 000000000000..664b5e77872d --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-man.patch @@ -0,0 +1,50 @@ +Author: gregor herrmann <gregoa@debian.org> +Last-Update: 2015-03-04 +Description: + - fix calls to pod2man + - remove stray "=cut", leads to pod2man errors + - add a note about using the gnuplot datafile +Bugs-Ubuntu: https://bugs.launchpad.net/bugs/476591 + +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -11,7 +11,7 @@ + EXTRA_DIST = cdck_man.in + + cdck.1: +- pod2man --section=cdck.1 --verbose cdck_man.in > cdck.1 ++ pod2man --section=1 --verbose --name=cdck cdck_man.in > cdck.1 + + + # +--- a/man/cdck_man.in ++++ b/man/cdck_man.in +@@ -1,5 +1,3 @@ +-=cut +- + =head1 NAME + + cdck - simple CD/DVD check program +@@ -17,6 +15,8 @@ + -i Print CD/DVD information and quit, perform no timings (default mode) + + -t Perform timing test ++ ++ Note: this option will not work for audio CDs. + + -p Save data for gnuplot(1) program + +@@ -26,7 +26,11 @@ + + -v Verbose operations + ++ To actually plot your data you have to start gnuplot and plot the datafile: ++ $ gnuplot ++ gnuplot> plot "cdck-plot.dat" ++ + =head1 COPYRIGHT + +- This manpage was written by gregor herrmann <gregor+debian@comodo.priv.at> for the +- Debian project but may be used by others. ++ This manpage was written by gregor herrmann <gregoa@debian.org> ++ for the Debian project, but may be used by others. diff --git a/app-cdr/cdck/files/cdck-0.7.0-wording.patch b/app-cdr/cdck/files/cdck-0.7.0-wording.patch new file mode 100644 index 000000000000..74e91c1f6bb6 --- /dev/null +++ b/app-cdr/cdck/files/cdck-0.7.0-wording.patch @@ -0,0 +1,25 @@ +Description: improve wording +Author: DenverD +Reviewed-by: gregor herrmann <gregoa@debian.org> +Last-Update: 2010-05-25 + +--- a/src/lib_main.cpp ++++ b/src/lib_main.cpp +@@ -566,7 +566,7 @@ + fprintf (stdout, "\nConclusion:\n"); + + if (bad_sectors > 0) { +- fprintf (stdout, " Disc contains BAD or even readable sectors, put it into trash can!\n"); ++ fprintf (stdout, " Disc contains BAD or even unreadable sectors, put it into trash can!\n"); + return; + } + +@@ -580,7 +580,7 @@ + return; + } + +- fprintf (stdout, " Even there is no unreadable sectors, disc is unstable!\n"); ++ fprintf (stdout, " Even though there are no unreadable sectors, disc is unstable!\n"); + } + + void Ccdrom::DeallocateTimings() diff --git a/app-cdr/cdck/metadata.xml b/app-cdr/cdck/metadata.xml index e09e5268ee34..6521a840a02e 100644 --- a/app-cdr/cdck/metadata.xml +++ b/app-cdr/cdck/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription> diff --git a/app-cdr/cddetect/metadata.xml b/app-cdr/cddetect/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/cddetect/metadata.xml +++ b/app-cdr/cddetect/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest index 244f5de15741..874b9b64283f 100644 --- a/app-cdr/cdemu-daemon/Manifest +++ b/app-cdr/cdemu-daemon/Manifest @@ -1,2 +1 @@ -DIST cdemu-daemon-3.2.4.tar.bz2 83580 BLAKE2B 56cfde3b9b9a98ba0da629deac717a740b7c92c67195ac282af5337f0e782b555f53221741a59abf3e78faacd066e34a722d08e27cef6fd1082cb75b46eb3ace SHA512 b5dd19a9325773e22c1910ae02f351803fb4f02197eaf5d41a984b4898a5fb0f027c70791d4c25553a9b589273fa3578d3cb12aa7a056f8639b341bd2ab44291 -DIST cdemu-daemon-3.2.5.tar.xz 85948 BLAKE2B f9b977ce964b15835afef54131cc158bc45389af30739706d93984bc24787b95034d9da7d56e88e018be9db66c185c16b7cf7481e0fdd0e97fed9e55b61419fd SHA512 6b084dc1809c9ccf8f9c24c671f13259d2e1ca6d2e6f7f85d44a47b4e973a68d7c92e470071421cdf6f2142eb26bdfd277a2f9c85b960d0b315b51a2d65953c7 +DIST cdemu-daemon-3.2.6.tar.xz 85976 BLAKE2B 33d03324fbc222674967f1d6b93c2bf1793528948cfce1089dbdfe799d3b40eaabae2e3f62b4696eba020f04c192e9d458a91e8bdd85465e00ec5a84194982e0 SHA512 cead8e4f7e0eec6e1284924cfe88cdfb78ec9f0769ffa423cd1801261540b3806a9704b6abbddc175e9e7d1aeef2acb9889b36ed13d89fd4b9dcda91fe1a08ca diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild deleted file mode 100644 index f41b381ac9fc..000000000000 --- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Daemon of the CDEmu optical media image mounting suite" -HOMEPAGE="https://cdemu.sourceforge.io" -SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=dev-libs/glib-2.38:2 - >=dev-libs/libmirage-3.2.0:= - >=media-libs/libao-0.8.0:=" -RDEPEND="${DEPEND} - sys-apps/dbus - >=sys-fs/vhba-20130607" -BDEPEND=" - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -DOCS=( AUTHORS README ) - -pkg_postinst() { - elog "You will need to load the vhba module to use cdemu devices:" - elog " # modprobe vhba" - elog "To automatically load the vhba module at boot time, edit your" - elog "/etc/conf.d/modules file." - - if [[ -e ${ROOT}/etc/conf.d/cdemud ]]; then - elog - elog "${PN} no longer installs an init.d service; instead, it is" - elog "automatically activated when needed via dbus." - elog "You can therefore remove ${ROOT}/etc/conf.d/cdemud" - fi -} diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild index 5b25b97d8257..931b086d6aa4 100644 --- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild +++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.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 diff --git a/app-cdr/cdemu-daemon/metadata.xml b/app-cdr/cdemu-daemon/metadata.xml index be81b6000604..503cdce610da 100644 --- a/app-cdr/cdemu-daemon/metadata.xml +++ b/app-cdr/cdemu-daemon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest index ee5e3c48a6c8..65c46fc743c5 100644 --- a/app-cdr/cdemu/Manifest +++ b/app-cdr/cdemu/Manifest @@ -1,2 +1 @@ -DIST cdemu-client-3.2.4.tar.bz2 44284 BLAKE2B c57fe09bef7112933a93fac9944eaff957e01692ec1ddec7fd443aa780f8b3d85d0bd640611337d896843de3ab00d09e093c293776a52afa85f781bdde7f4250 SHA512 2e10cb345e261ddaa6da68ee626770ed65749b1ea64c2bbbf0f3a2e96184c2906834886754e87e3161c3056473e5ee0dc20672ce7cb48232e6bef1c93cb80550 DIST cdemu-client-3.2.5.tar.xz 41596 BLAKE2B 5b3e5a16f9daa0ab2c670a8cba54af380894e668c87a64a5e2126777d6725420d9bb7f41290ca69eba12e20db97b00cc74aea3df9694ef331e7a571b913820b1 SHA512 d143705607507503cd7828f02e7a0fbe5d33f15e28ce61f453567d8635ed863c5b508ed2b1964f034d846ecdea752bd3dfb565350174db3e06cf7d29c2f828bf diff --git a/app-cdr/cdemu/cdemu-3.2.4.ebuild b/app-cdr/cdemu/cdemu-3.2.5-r1.ebuild index 5a356756ead0..c697a93a5418 100644 --- a/app-cdr/cdemu/cdemu-3.2.4.ebuild +++ b/app-cdr/cdemu/cdemu-3.2.5-r1.ebuild @@ -1,34 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 cmake python-single-r1 xdg-utils MY_P=cdemu-client-${PV} DESCRIPTION="Command-line tool for controlling cdemu-daemon" HOMEPAGE="https://cdemu.sourceforge.io" -SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.bz2" +SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.xz" S=${WORKDIR}/${MY_P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="+cdemu-daemon" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] ') - cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )" -BDEPEND="${PYTHON_DEPS} + cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 ) +" +BDEPEND=" + ${PYTHON_DEPS} dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( AUTHORS README ) @@ -41,11 +45,17 @@ src_prepare() { src_configure() { local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF - -DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)" + # requires bash-completion as BDEPEND, better install it manually + -DENABLE_BASH_COMPLETION=OFF ) cmake_src_configure } +src_install() { + cmake_src_install + newbashcomp data/cdemu-bash-completion.sh cdemu +} + pkg_postinst() { xdg_desktop_database_update } diff --git a/app-cdr/cdemu/cdemu-3.2.5.ebuild b/app-cdr/cdemu/cdemu-3.2.5.ebuild index 35a46b90f6ed..ae8d6c535a29 100644 --- a/app-cdr/cdemu/cdemu-3.2.5.ebuild +++ b/app-cdr/cdemu/cdemu-3.2.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 cmake python-single-r1 xdg-utils @@ -19,16 +19,20 @@ KEYWORDS="amd64 x86" IUSE="+cdemu-daemon" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] ') - cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )" -BDEPEND="${PYTHON_DEPS} + cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 ) +" +BDEPEND=" + ${PYTHON_DEPS} dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( AUTHORS README ) diff --git a/app-cdr/cdemu/metadata.xml b/app-cdr/cdemu/metadata.xml index 91b41a812977..edbbc440aff2 100644 --- a/app-cdr/cdemu/metadata.xml +++ b/app-cdr/cdemu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> diff --git a/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.3.0-r1.ebuild index e72ab4ecc2c7..b7469be291ee 100644 --- a/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild +++ b/app-cdr/cdlabelgen/cdlabelgen-4.3.0-r1.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="CD cover, tray card and envelope generator" HOMEPAGE="https://www.aczoom.com/tools/cdinsert" SRC_URI="https://www.aczoom.com/pub/tools/${P}.tgz" + LICENSE="aczoom" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" RDEPEND="dev-lang/perl" -DEPEND="" PATCHES=( "${FILESDIR}"/4.0.0-create-MAN_DIR.diff ) -DOCS=( ChangeLog README INSTALL.WEB ) src_install() { - emake BASE_DIR="${D}"/usr install - einstalldocs - insinto "/usr/share/${PN}" + emake BASE_DIR="${ED}"/usr install + dodoc ChangeLog README INSTALL.WEB + + insinto /usr/share/cdlabelgen doins *.html - exeinto "/usr/share/${PN}" + + exeinto /usr/share/cdlabelgen doexe cdinsert{,-ps}.pl } diff --git a/app-cdr/cdlabelgen/metadata.xml b/app-cdr/cdlabelgen/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/cdlabelgen/metadata.xml +++ b/app-cdr/cdlabelgen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest index 69cebed78afe..c66587c5f8c2 100644 --- a/app-cdr/cdrdao/Manifest +++ b/app-cdr/cdrdao/Manifest @@ -1 +1,2 @@ -DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09 +DIST cdrdao-1.2.4.tar.gz 1603363 BLAKE2B 9c22d21a391b6b1b6ded19f88506acd22e681a43ed91b1c71d20de27ce93cc74381d4efe8574adc929a189143c81f5838ca8d8227ec0e2e05a593f0df9547964 SHA512 decdc9d83fe380a4a05443ac26366eb3288d24bd7ed6c16d006707abb616dab91858a59af6638f2d7a72bc7bb6425dbfddd119ca492d18f07afbb27341b23d0b +DIST cdrdao-1.2.5.tar.gz 858440 BLAKE2B 6b7f11968335f3c07df2bfc8cbfd53d65a42413026206c47f9bdc792d30faa91f3e9285fd36d884ee42cb31103f666097fb55c8f382202f4e9d2d4ddd4685527 SHA512 790468a28e5ba96421c83c2101f61f479099782bc28677c7f52b94990de258e3caf7f77d3105e3e826d848b9488182880857335b1bcfbfca033d9e1fc56d193b diff --git a/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild new file mode 100644 index 000000000000..e53adf8b4c31 --- /dev/null +++ b/app-cdr/cdrdao/cdrdao-1.2.4-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_PV="rel_${PV//./_}" +DESCRIPTION="Burn CDs in disk-at-once mode with a command line interface" +HOMEPAGE="https://github.com/cdrdao/cdrdao/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="encode mad vorbis" + +DEPEND="app-cdr/cdrtools + encode? ( >=media-sound/lame-3.99 ) + mad? ( + media-libs/libao + media-libs/libmad + ) + vorbis? ( + media-libs/libao + media-libs/libvorbis + )" +RDEPEND="${DEPEND} + !app-cdr/cue2toc" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-ax_pthread2.patch" + "${FILESDIR}/${P}-wformat-security.patch" +) +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + default + + ./autogen.sh || die + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++11 + + filter-lto # https://bugs.gentoo.org/854219 + + local myeconfargs=( + --without-gcdmaster + $(use_with vorbis ogg-support) + $(use_with mad mp3-support) + $(use_with encode lame) + ) + econf "${myeconfargs[@]}" +} diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild deleted file mode 100644 index e083bfe8fa6d..000000000000 --- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic - -DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend" -HOMEPAGE="http://cdrdao.sourceforge.net/" -if [[ ${PV/*_rc*} ]] -then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -else - SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="encode mad vorbis" - -COMMON_DEPEND=" - app-cdr/cdrtools - encode? ( >=media-sound/lame-3.99 ) - mad? ( - media-libs/libmad - media-libs/libao - ) - vorbis? ( - media-libs/libvorbis - media-libs/libao - )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !app-cdr/cue2toc - !dev-util/pccts" - -PATCHES=( - "${FILESDIR}/${P}-ax_pthread.patch" - "${FILESDIR}/${P}-wformat-security.patch" -) - -S="${WORKDIR}/${P/_}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Fix building with latest libsigc++ - append-cxxflags -std=c++11 - find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die - - local myeconfargs=( - --without-gcdmaster - $(use_with vorbis ogg-support) - $(use_with mad mp3-support) - $(use_with encode lame) - ) - econf "${myeconfargs[@]}" -} diff --git a/app-cdr/cdrdao/cdrdao-1.2.5-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.5-r1.ebuild new file mode 100644 index 000000000000..219170ed12f8 --- /dev/null +++ b/app-cdr/cdrdao/cdrdao-1.2.5-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_PV="rel_${PV//./_}" +DESCRIPTION="Burn CDs in disk-at-once mode with a command line interface" +HOMEPAGE="https://github.com/cdrdao/cdrdao/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="encode mad vorbis" + +DEPEND="app-cdr/cdrtools + encode? ( >=media-sound/lame-3.99 ) + mad? ( + media-libs/libao + media-libs/libmad + ) + vorbis? ( + media-libs/libao + media-libs/libvorbis + )" +RDEPEND="${DEPEND} + !app-cdr/cue2toc" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-remove-gconf-dep.patch" + "${FILESDIR}/${PN}-1.2.5-fix-uninit.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++11 + + filter-lto # https://bugs.gentoo.org/854219 + + local myeconfargs=( + --without-gcdmaster + $(use_with vorbis ogg-support) + $(use_with mad mp3-support) + $(use_with encode lame) + ) + econf "${myeconfargs[@]}" +} diff --git a/app-cdr/cdrdao/cdrdao-1.2.5.ebuild b/app-cdr/cdrdao/cdrdao-1.2.5.ebuild new file mode 100644 index 000000000000..67ce9118cd2d --- /dev/null +++ b/app-cdr/cdrdao/cdrdao-1.2.5.ebuild @@ -0,0 +1,53 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_PV="rel_${PV//./_}" +DESCRIPTION="Burn CDs in disk-at-once mode with a command line interface" +HOMEPAGE="https://github.com/cdrdao/cdrdao/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="encode mad vorbis" + +DEPEND="app-cdr/cdrtools + encode? ( >=media-sound/lame-3.99 ) + mad? ( + media-libs/libao + media-libs/libmad + ) + vorbis? ( + media-libs/libao + media-libs/libvorbis + )" +RDEPEND="${DEPEND} + !app-cdr/cue2toc" +BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${P}-remove-gconf-dep.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++11 + + filter-lto # https://bugs.gentoo.org/854219 + + local myeconfargs=( + --without-gcdmaster + $(use_with vorbis ogg-support) + $(use_with mad mp3-support) + $(use_with encode lame) + ) + econf "${myeconfargs[@]}" +} diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread2.patch index fe052db02af7..8412708d4cb2 100644 --- a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch +++ b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread2.patch @@ -3,9 +3,20 @@ to CFLAGS, CXXFLAGS and LIBS. Also use AM_PROG_AR to detect proper ar See also: https://bugs.gentoo.org/548004 ---- cdrdao-1.2.4/configure.ac -+++ cdrdao-1.2.4/configure.ac -@@ -2,6 +2,7 @@ +--- cdrdao-rel_1_2_4.orig/autogen.sh ++++ cdrdao-rel_1_2_4/autogen.sh +@@ -48,4 +48,7 @@ + # Calls aclocal, automake, autoconf and al. for you + echo "Running autoreconf" + rm -fr autom4te.cache +-autoreconf ++aclocal ++autoheader ++automake --add-missing --copy --foreign --force-missing ++autoconf +--- cdrdao-rel_1_2_4.orig/configure.ac ++++ cdrdao-rel_1_2_4/configure.ac +@@ -2,13 +2,13 @@ AC_REVISION($Revision: 1.26 $)dnl AC_INIT(cdrdao, 1.2.4) @@ -13,7 +24,14 @@ See also: https://bugs.gentoo.org/548004 AC_CONFIG_SRCDIR(dao/main.cc) AM_INIT_AUTOMAKE -@@ -32,7 +33,7 @@ + AM_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + AC_CANONICAL_HOST +-AM_GCONF_SOURCE_2 + + AC_ARG_WITH(pcctsbin,[ --with-pcctsbin=dir set directory of PCCTS parser generator executables],[pcctsbin=$withval],[pcctsbin=default]) + +@@ -32,7 +32,7 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_RANLIB @@ -22,7 +40,7 @@ See also: https://bugs.gentoo.org/548004 AC_PROG_MAKE_SET AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -@@ -113,7 +114,10 @@ +@@ -113,7 +113,10 @@ fi if test "$use_pthreads" = yes; then @@ -34,8 +52,8 @@ See also: https://bugs.gentoo.org/548004 if test "$have_pthread_std" = yes; then AC_DEFINE(USE_POSIX_THREADS,1,"") ---- cdrdao-1.2.4/m4/ax_pthread.m4 -+++ cdrdao-1.2.4/m4/ax_pthread.m4 +--- cdrdao-rel_1_2_4.orig/m4/ax_pthread.m4 ++++ cdrdao-rel_1_2_4/m4/ax_pthread.m4 @@ -0,0 +1,332 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_pthread.html @@ -369,50 +387,3 @@ See also: https://bugs.gentoo.org/548004 +fi +AC_LANG_POP +])dnl AX_PTHREAD ---- cdrdao-1.2.4/m4/gconf-2.m4 -+++ cdrdao-1.2.4/m4/gconf-2.m4 -@@ -0,0 +1,44 @@ -+dnl AM_GCONF_SOURCE_2 -+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to gconftool-2 -+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl you should install foo.schemas files -+dnl -+ -+AC_DEFUN([AM_GCONF_SOURCE_2], -+[ -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ fi -+ -+ AC_ARG_WITH([gconf-source], -+ AC_HELP_STRING([--with-gconf-source=sourceaddress], -+ [Config database for installing schema files.]), -+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) -+ -+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ -+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ fi -+ -+ AC_ARG_WITH([gconf-schema-file-dir], -+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], -+ [Directory for installing schema files.]), -+ [GCONF_SCHEMA_FILE_DIR="$withval"],) -+ -+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ -+ AC_ARG_ENABLE(schemas-install, -+ AC_HELP_STRING([--disable-schemas-install], -+ [Disable the schemas installation]), -+ [case ${enableval} in -+ yes|no) ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; -+ esac]) -+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -+]) diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.5-fix-uninit.patch b/app-cdr/cdrdao/files/cdrdao-1.2.5-fix-uninit.patch new file mode 100644 index 000000000000..6748dba34cf6 --- /dev/null +++ b/app-cdr/cdrdao/files/cdrdao-1.2.5-fix-uninit.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/915133 +https://github.com/cdrdao/cdrdao/issues/22 +https://github.com/cdrdao/cdrdao/pull/21 + +From 251a40ab42305c412674c7c2d391374d91e91c95 Mon Sep 17 00:00:00 2001 +From: Ole Bertram <git@bertr.am> +Date: Thu, 23 Mar 2023 17:08:48 +0100 +Subject: [PATCH] Fix uninitialized TOC data file name + +This caused spurious garbled TOC files and/or segfaults when not using +the `--datafile` option. +--- + dao/main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dao/main.cc b/dao/main.cc +index 8bf4590..d09fc69 100644 +--- a/dao/main.cc ++++ b/dao/main.cc +@@ -219,6 +219,7 @@ DaoCommandLine::DaoCommandLine() : + fullBurn(false), withCddb(false), taoSource(false), keepImage(false), overburn(false), + writeSpeedControl(false), keep(false), printQuery(false), no_utf8(false) + { ++ dataFilename = NULL; + readingSpeed = -1; + writingSpeed = -1; + command = UNKNOWN; diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.5-remove-gconf-dep.patch b/app-cdr/cdrdao/files/cdrdao-1.2.5-remove-gconf-dep.patch new file mode 100644 index 000000000000..fc493abc71f2 --- /dev/null +++ b/app-cdr/cdrdao/files/cdrdao-1.2.5-remove-gconf-dep.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,6 @@ + AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + AC_CANONICAL_HOST +-AM_GCONF_SOURCE_2 + AM_ICONV + + AC_ARG_WITH(pcctsbin,[ --with-pcctsbin=dir set directory of PCCTS parser generator executables],[pcctsbin=$withval],[pcctsbin=default]) diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml index 266fe7cc02d8..6a5c72acfb05 100644 --- a/app-cdr/cdrdao/metadata.xml +++ b/app-cdr/cdrdao/metadata.xml @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>martin.dummer@gmx.net</email> + <name>Martin Dummer</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> - CD command line recording, ripping and copying tool. Especially ISOs- and - bin/cue-files are handled very well. + CD command line recording, ripping and copying tool. Especially ISOs and bin/cue-files are handled very well. </longdescription> <upstream> - <remote-id type="sourceforge">cdrdao</remote-id> + <remote-id type="github">cdrdao/cdrdao</remote-id> </upstream> </pkgmetadata> diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild index fddb123d5e83..00968a87ae73 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig +inherit fcaps toolchain-funcs flag-o-matic gnuconfig MY_P="${P/_alpha/a}" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="acl caps nls unicode selinux" BDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) - !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord ) " DEPEND=" @@ -42,7 +41,6 @@ FILECAPS=( cdrtools_os() { local os="linux" [[ ${CHOST} == *-darwin* ]] && os="mac-os10" - [[ ${CHOST} == *-freebsd* ]] && os="freebsd" echo "${os}" } @@ -51,12 +49,6 @@ src_prepare() { gnuconfig_update - # This fixes a clash with clone() on uclibc. Upstream isn't - # going to include this so let's try to carry it forward. - # Contact me if it needs updating. Bug #486782. - # Anthony G. Basile <blueness@gentoo.org>. - use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch - # Remove profiled make files. find -name '*_p.mk' -delete || die "delete *_p.mk" @@ -86,8 +78,12 @@ src_prepare() { # Respect CC/CXX variables. cd "${S}"/RULES || die - local tcCC=$(tc-getCC) - local tcCXX=$(tc-getCXX) + local tcCC="$(tc-getCC)" + local tcCXX="$(tc-getCXX)" + # fix RISC-V build err, bug 811375 + ln -s i586-linux-cc.rul riscv-linux-cc.rul || die + ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die + sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ rules1.top || die "sed rules1.top" sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r5.ebuild index 5ff3221ef76d..414e4bca945e 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig +inherit fcaps toolchain-funcs flag-o-matic gnuconfig MY_P="${P/_alpha/a}" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="acl caps nls unicode selinux" BDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) - !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord ) " DEPEND=" @@ -42,20 +41,32 @@ FILECAPS=( cdrtools_os() { local os="linux" [[ ${CHOST} == *-darwin* ]] && os="mac-os10" - [[ ${CHOST} == *-freebsd* ]] && os="freebsd" echo "${os}" } +symlink_build_rules() { + local cputype="$1" + pushd "${S}"/RULES > /dev/null || die + ln -sf i586-linux-cc.rul "${cputype}"-linux-cc.rul || die + ln -sf i586-linux-clang.rul "${cputype}"-linux-clang.rul || die + ln -sf i586-linux-clang32.rul "${cputype}"-linux-clang32.rul || die + ln -sf i586-linux-clang64.rul "${cputype}"-linux-clang64.rul || die + ln -sf i586-linux-gcc.rul "${cputype}"-linux-gcc.rul || die + ln -sf i586-linux-gcc32.rul "${cputype}"-linux-gcc32.rul || die + ln -sf i586-linux-gcc64.rul "${cputype}"-linux-gcc64.rul || die + popd > /dev/null || die +} + src_prepare() { default gnuconfig_update - # This fixes a clash with clone() on uclibc. Upstream isn't - # going to include this so let's try to carry it forward. - # Contact me if it needs updating. Bug #486782. - # Anthony G. Basile <blueness@gentoo.org>. - use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch + # bug #898582, bug #903876 + append-flags -std=gnu89 + # bug #884771 + append-flags -fno-strict-aliasing + filter-lto # Remove profiled make files. find -name '*_p.mk' -delete || die "delete *_p.mk" @@ -79,6 +90,11 @@ src_prepare() { $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ || die "sed rules" + # Don't quote $(MAKE) + sed -i -e 's|"$(MAKE)"|$(MAKE)|' \ + $(find ./RULES -type f -exec grep -l '"$(MAKE)"' '{}' '+') \ + || die "sed RULES/" + # Enable verbose build. sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \ RULES/*.rul RULES/rules.prg RULES/rules.inc \ @@ -86,8 +102,9 @@ src_prepare() { # Respect CC/CXX variables. cd "${S}"/RULES || die - local tcCC=$(tc-getCC) - local tcCXX=$(tc-getCXX) + local tcCC="$(tc-getCC)" + local tcCXX="$(tc-getCXX)" + sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ rules1.top || die "sed rules1.top" sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ @@ -98,6 +115,18 @@ src_prepare() { sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ rules.cnf || die "sed rules.cnf" + # Add support for arm64 + symlink_build_rules aarch64_be + + # fix RISC-V build err, bug 811375 + symlink_build_rules riscv + symlink_build_rules riscv64 + # big endian support, bug 907029 + symlink_build_rules riscv64be + + # Add support for loong + symlink_build_rules loongarch64 + # Schily make setup. cd "${S}"/DEFAULTS || die local os=$(cdrtools_os) @@ -147,6 +176,8 @@ src_configure() { use acl || export ac_cv_header_sys_acl_h="no" use caps || export ac_cv_lib_cap_cap_get_proc="no" export ac_cv_header_pulse_pulseaudio_h="no" + export ac_cv_header_alsa_asoundlib_h="no" + export ac_cv_lib_asound_snd_pcm_open="no" # skip obsolete configure script if tc-is-cross-compiler ; then diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild deleted file mode 100644 index f11ca585ee0f..000000000000 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig - -MY_P="${P/_alpha/a}" - -DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="https://sourceforge.net/projects/cdrtools/" -SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="acl caps nls unicode" - -RDEPEND="acl? ( virtual/acl ) - caps? ( sys-libs/libcap ) - nls? ( virtual/libintl ) - !app-cdr/cdrkit" -DEPEND="${RDEPEND} - x11-misc/makedepend - nls? ( >=sys-devel/gettext-0.18.1.1 )" - -S=${WORKDIR}/${P/_alpha[0-9][0-9]} - -FILECAPS=( - cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord -- - cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav -- - cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd -) - -cdrtools_os() { - local os="linux" - [[ ${CHOST} == *-darwin* ]] && os="mac-os10" - [[ ${CHOST} == *-freebsd* ]] && os="freebsd" - echo "${os}" -} - -src_prepare() { - default - - gnuconfig_update - - # This fixes a clash with clone() on uclibc. Upstream isn't - # going to include this so let's try to carry it forward. - # Contact me if it needs updating. Bug #486782. - # Anthony G. Basile <blueness@gentoo.org>. - use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch - - # Remove profiled make files. - find -name '*_p.mk' -delete || die "delete *_p.mk" - - # Adjusting hardcoded paths. - sed -i -e "s|opt/schily|usr|" \ - $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ - || die "sed opt/schily" - - sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \ - $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \ - || die "sed doc" - - # Respect libdir. - sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \ - $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \ - || die "sed multilib" - - # Do not install static libraries. - sed -i -e "s|include\t\t.*rules.lib||" \ - $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ - || die "sed rules" - - # Enable verbose build. - sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \ - RULES/*.rul RULES/rules.prg RULES/rules.inc \ - || die "sed verbose rules" - - # Respect CC/CXX variables. - cd "${S}"/RULES || die - local tcCC=$(tc-getCC) - local tcCXX=$(tc-getCXX) - sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ - rules1.top || die "sed rules1.top" - sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ - -e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \ - -e "/COPTOPT=/s|-O||" \ - -e 's|$(GCCOPTOPT)||' \ - cc-gcc.rul || die "sed cc-gcc.rul" - sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ - rules.cnf || die "sed rules.cnf" - - # Schily make setup. - cd "${S}"/DEFAULTS || die - local os=$(cdrtools_os) - - sed -i \ - -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \ - -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ - -e "s|^\(LDPATH=\).*|\1|" \ - -e "s|^\(RUNPATH=\).*|\1|" \ - -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ - -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ - -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ - -e '/^DEFUMASK/s,002,022,g' \ - Defaults.${os} || die "sed Schily make setup" - # re DEFUMASK above: - # bug 486680: grsec TPE will block the exec if the directory is - # group-writable. This is painful with cdrtools, because it makes a bunch of - # group-writable directories during build. Change the umask on their - # creation to prevent this. -} - -ac_cv_sizeof() { - cat <<-EOF >"${T}"/test.c - #include <inttypes.h> - #include <stddef.h> - #include <stdint.h> - #include <sys/types.h> - int main () { - static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)]; - test_array [0] = 0; - return test_array [0]; - } - EOF - - local i=1 - while [[ ${i} -lt 20 ]] ; do - if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then - echo ${i} - return 0 - fi - : $(( i += 1 )) - done - return 1 -} - -src_configure() { - use acl || export ac_cv_header_sys_acl_h="no" - use caps || export ac_cv_lib_cap_cap_get_proc="no" - export ac_cv_header_pulse_pulseaudio_h="no" - - # skip obsolete configure script - if tc-is-cross-compiler ; then - # Cache known values for targets. #486680 - - tc-export CC - local var val t types=( - char "short int" int "long int" "long long" - "unsigned char" "unsigned short int" "unsigned int" - "unsigned long int" "unsigned long long" - float double "long double" size_t ssize_t ptrdiff_t - mode_t uid_t gid_t pid_t dev_t time_t wchar_t - "char *" "unsigned char *" - ) - for t in "${types[@]}" ; do - var="ac_cv_sizeof_${t// /_}" - var=${var//[*]/p} - val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}" - export "${var}=${val}" - einfo "Computing sizeof(${t}) as ${val}" - done - # We don't have these types. - export ac_cv_sizeof___int64=0 - export ac_cv_sizeof_unsigned___int64=0 - export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t} - export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t} - export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t} - - export ac_cv_type_prototypes="yes" - export ac_cv_func_mlock{,all}="yes" - export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc) - export ac_cv_func_dtoa_r="no" - export ac_cv_func_sys_siglist{,_def}="no" - export ac_cv_func_printf_{j,ll}="yes" - export ac_cv_realloc_null="yes" - export ac_cv_no_user_malloc="no" - export ac_cv_var_timezone="yes" - export ac_cv_var___progname{,_full}="yes" - export ac_cv_fnmatch_igncase="yes" - export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes" - export ac_cv_file__usr_src_linux_include="no" - - case $(cdrtools_os) in - linux) - export ac_cv_func_bsd_{g,s}etpgrp="no" - export ac_cv_hard_symlinks="yes" - export ac_cv_link_nofollow="yes" - export ac_cv_access_e_ok="no" - - export ac_cv_dev_minor_noncontig="yes" - case ${ac_cv_sizeof_long_int} in - 4) export ac_cv_dev_minor_bits="32";; - 8) export ac_cv_dev_minor_bits="44";; - esac - - cat <<-EOF >"${T}"/test.c - struct { - char start[6]; - unsigned char x1:4; - unsigned char x2:4; - char end[5]; - } a = { - .start = {'S', 't', 'A', 'r', 'T', '_'}, - .x1 = 5, - .x2 = 4, - .end = {'_', 'e', 'N', 'd', 'X'}, - }; - EOF - ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o - if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then - export ac_cv_c_bitfields_htol="no" - elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then - export ac_cv_c_bitfields_htol="yes" - fi - ;; - esac - fi -} - -src_compile() { - if use unicode; then - local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" - if [[ -n ${flags} ]]; then - append-flags ${flags} - else - ewarn "Your compiler does not support the options required to build" - ewarn "cdrtools with unicode in USE. unicode flag will be ignored." - fi - fi - - # If not built with -j1, "sometimes" cdda2wav will not be built. - emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ - LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" -} - -src_install() { - # If not built with -j1, "sometimes" manpages are not installed. - emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ - LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install - - # These symlinks are for compat with cdrkit. - dosym schily /usr/include/scsilib - dosym ../scg /usr/include/schily/scg - - dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux - - cd "${S}"/cdda2wav || die - docinto cdda2wav - dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO - - cd "${S}"/mkisofs || die - docinto mkisofs - dodoc ChangeLog* TODO - - # Remove man pages related to the build system - rm -rvf "${ED}"/usr/share/man/man5 || die -} - -pkg_postinst() { - fcaps_pkg_postinst - - if [[ ${CHOST} == *-darwin* ]] ; then - einfo - einfo "Darwin/OS X use the following device names:" - einfo - einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices" - einfo - einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices" - einfo - fi -} diff --git a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch deleted file mode 100644 index 4ba244bf32b7..000000000000 --- a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/readcd/readcd.c -+++ b/readcd/readcd.c -@@ -257,7 +257,7 @@ - BOOL pifscan; - BOOL plot; - BOOL fulltoc; --BOOL clone; -+BOOL clonetoc; - BOOL edc_corr; - BOOL noerror; - BOOL nocorr; -@@ -294,7 +294,7 @@ - error(_("\t-plot Print data suitable for gnuplot\n")); - #ifdef CLONE_WRITE - error(_("\t-fulltoc Retrieve the full TOC\n")); -- error(_("\t-clone Retrieve the full TOC and all data\n")); -+ error(_("\t-clonetoc Retrieve the full TOC and all data\n")); - error(_("\t-edc-corr Try to do user level Reed Solomon repair (experimental)\n")); - #endif - error(_("\ttimeout=# set the default SCSI command timeout to #.\n")); -@@ -320,7 +320,7 @@ - } - - /* CSTYLED */ --char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#"; -+char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#"; - - EXPORT int - main(ac, av) -@@ -397,7 +397,7 @@ - &scanbus, &dev, &scgopts, §ors, &do_write, - &c2scan, &cxscan, &pi8scan, &pifscan, - &plot, -- &fulltoc, &clone, -+ &fulltoc, &clonetoc, - &edc_corr, - &noerror, &nocorr, - ¬runc, &retries, &do_factor, &filename, -@@ -679,7 +679,7 @@ - - if (filename || sectors || c2scan || cxscan || pi8scan || pifscan || - meshpoints || fulltoc || -- clone || edc_corr) { -+ clonetoc || edc_corr) { - dorw(scgp, filename, sectors); - } else { - doit(scgp); -@@ -894,9 +894,9 @@ - if (params.name == NULL) - params.name = "/dev/null"; - read_ftoc(scgp, ¶ms, FALSE); -- } else if (clone || edc_corr) { -+ } else if (clonetoc || edc_corr) { - if (!is_mmc(scgp, NULL, NULL)) -- comerrno(EX_BAD, _("Unsupported device for clone mode.\n")); -+ comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n")); - if (!edc_corr) - noerror = TRUE; - if (retries == MAX_RETRY) -@@ -904,7 +904,7 @@ - if (params.name == NULL) - params.name = "/dev/null"; - -- if (clone) -+ if (clonetoc) - if (read_ftoc(scgp, ¶ms, TRUE) < 0) - comerrno(EX_BAD, _("Read fulltoc problems.\n")); - readcd_disk(scgp, ¶ms); diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml index c02a76479c6e..fc654620df42 100644 --- a/app-cdr/cdrtools/metadata.xml +++ b/app-cdr/cdrtools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>billie@gentoo.org</email> diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r3.ebuild index a059a13f7d59..d60619dc4f39 100644 --- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild +++ b/app-cdr/cdw/cdw-0.8.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools toolchain-funcs @@ -18,7 +18,7 @@ RDEPEND=" app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] - sys-libs/ncurses:0=[unicode] + sys-libs/ncurses:= " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" @@ -33,5 +33,5 @@ src_prepare() { } src_configure() { - econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" + econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncursesw )" } diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild deleted file mode 100644 index 0c9539fc86eb..000000000000 --- a/app-cdr/cdw/cdw-9999.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw" -ECVS_MODULE="cdw" -ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}" -inherit autotools cvs toolchain-funcs - -DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" -HOMEPAGE="http://cdw.sourceforge.net" - -LICENSE="GPL-2+" -SLOT="0" - -RDEPEND=" - app-cdr/cdrtools - app-cdr/dvd+rw-tools - dev-libs/libburn - dev-libs/libcdio:=[-minimal] - sys-libs/ncurses:0=[unicode] -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S=${WORKDIR}/${ECVS_MODULE} - -PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" ) - -DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" -} diff --git a/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch index a578696c1c82..3ad1aaa6a935 100644 --- a/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch +++ b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch @@ -1,5 +1,3 @@ -diff --git a/configure.ac b/configure.ac -index 76627c7..527e2cb 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ AC_TYPE_UINT16_T @@ -11,8 +9,6 @@ index 76627c7..527e2cb 100644 -diff --git a/src/user_interface/Makefile.in b/src/user_interface/Makefile.in -index 5d5f1fc..4d8214b 100644 --- a/src/user_interface/Makefile.in +++ b/src/user_interface/Makefile.in @@ -88,7 +88,7 @@ CONFIG_HEADER = $(top_builddir)/config_cdw.h diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml index 7be2c9fe2701..ffc106331422 100644 --- a/app-cdr/cdw/metadata.xml +++ b/app-cdr/cdw/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arthurzam+gentoo@gmail.com</email> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> <name>Arthur Zamarin</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="sourceforge">cdw</remote-id> </upstream> diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4-r1.ebuild index 66abd1c3f554..0270d4033ad9 100644 --- a/app-cdr/cue2toc/cue2toc-0.4.ebuild +++ b/app-cdr/cue2toc/cue2toc-0.4-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Convert CUE files to cdrdao's TOC format" -HOMEPAGE="http://cue2toc.sourceforge.net/" +HOMEPAGE="https://cue2toc.sourceforge.net/" SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86" -IUSE="" -DEPEND="!app-cdr/cdrdao" +DEPEND="!!app-cdr/cdrdao" diff --git a/app-cdr/cue2toc/metadata.xml b/app-cdr/cue2toc/metadata.xml index ac480ee50abf..5c16ace7d59b 100644 --- a/app-cdr/cue2toc/metadata.xml +++ b/app-cdr/cue2toc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild index 03166b162e34..da05b944e010 100644 --- a/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild +++ b/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit toolchain-funcs +EAPI=8 + +inherit autotools toolchain-funcs DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -11,26 +12,36 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -# Enable one use flag by default, bug 254745" -IUSE="flac mp3 +vorbis" +# Enable one use flag by default, bug #254745 +IUSE="+flac mp3 +vorbis" REQUIRED_USE="|| ( flac mp3 vorbis )" DEPEND=" - flac? ( media-libs/flac ) + flac? ( media-libs/flac:= ) mp3? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis media-libs/libogg ) " RDEPEND=" ${DEPEND} " +# We always need flac for AM_PATH_LIBFLAC if autoreconfing, bug #882447 +BDEPEND="media-libs/flac" PATCHES=( "${FILESDIR}"/${P}-flac113.diff # bug 157706 "${FILESDIR}"/${P}-namespace.patch "${FILESDIR}"/${P}-unused.patch "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-configure.patch ) +src_prepare() { + default + + # Clang 16 + eautoreconf +} + src_configure() { econf \ $(use_enable flac) \ diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch b/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch new file mode 100644 index 000000000000..d0a9864228aa --- /dev/null +++ b/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch @@ -0,0 +1,13 @@ +-ansi -pednatic breaks various configure tests. autoconf already says +not to use -Werror but any -W* is dangerous for configure itself. +--- a/configure.in ++++ b/configure.in +@@ -4,7 +4,7 @@ dnl AM_INIT_AUTOMAKE + + AC_CONFIG_SRCDIR(src/libcuecue/cuecue.c) + +-CFLAGS="$CFLAGS -Wall -ansi -pedantic -g -Os" ++CFLAGS="-Wall -O2 ${CFLAGS}" + VERSION=0.2.2 + + PACKAGE="cuecue" diff --git a/app-cdr/cuecue/metadata.xml b/app-cdr/cuecue/metadata.xml index 74eb34bd0058..683fc1b7c97b 100644 --- a/app-cdr/cuecue/metadata.xml +++ b/app-cdr/cuecue/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-cdr/cuegen/cuegen-1.2.0.ebuild b/app-cdr/cuegen/cuegen-1.2.0-r1.ebuild index 2f72c4191258..85cb4049484a 100644 --- a/app-cdr/cuegen/cuegen-1.2.0.ebuild +++ b/app-cdr/cuegen/cuegen-1.2.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="CUEgen is a FLAC-compatible cuesheet generator for Linux" HOMEPAGE="http://www.cs.man.ac.uk/~slavinp/cuegen.html" @@ -12,12 +12,13 @@ SRC_URI="http://www.cs.man.ac.uk/~slavinp/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -PATCHES=( "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch + "${FILESDIR}"/${PN}-1.2.0-missing-includes.patch +) src_configure() { - append-cflags -W -Wall -Wstrict-prototypes -Wmissing-prototypes tc-export CC } diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch index 614ec59f905d..fa54235d0e4f 100644 --- a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch +++ b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch @@ -1,11 +1,12 @@ --- a/Makefile +++ b/Makefile -@@ -1,9 +1 @@ +@@ -1,9 +1,3 @@ -TARGET := cuegen -CC := gcc -CFLAGS := -O2 -pipe -fomit-frame-pointer -WARN := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -- ++CFLAGS += -W -Wall -Wstrict-prototypes -Wmissing-prototypes + all: cuegen - -cuegen: cuegen.o diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch b/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch new file mode 100644 index 000000000000..98a273cddb13 --- /dev/null +++ b/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch @@ -0,0 +1,17 @@ +--- a/cuegen.c ++++ b/cuegen.c +@@ -10,12 +10,14 @@ + */ + + ++#include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> + #include <linux/cdrom.h> + #include <sys/ioctl.h> + #include <sys/file.h> + #include <sys/types.h> ++#include <sys/stat.h> + #include <unistd.h> + #include <string.h> + diff --git a/app-cdr/cuegen/metadata.xml b/app-cdr/cuegen/metadata.xml index 8d355000b606..d54b830be63c 100644 --- a/app-cdr/cuegen/metadata.xml +++ b/app-cdr/cuegen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-cdr/cuetools/cuetools-1.4.1.ebuild b/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild index 2f34d2525069..07b455fc8677 100644 --- a/app-cdr/cuetools/cuetools-1.4.1.ebuild +++ b/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit autotools eutils +inherit autotools optfeature DESCRIPTION="Utilities to manipulate and convert cue and toc files" HOMEPAGE="https://github.com/svend/cuetools" @@ -12,21 +12,21 @@ SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="flac mp3 vorbis" - -RDEPEND=" - flac? ( media-libs/flac ) - mp3? ( media-sound/mp3info ) - vorbis? ( media-sound/vorbis-tools ) -" src_prepare() { + default eautoreconf } src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README.md TODO + default + docinto extras dodoc extras/{cueconvert.cgi,*.txt} } + +pkg_postinst() { + optfeature "FLAC support" 'media-libs/flac' + optfeature "MP3 support" 'media-sound/mp3info' + optfeature "Vorbis support" 'media-sound/vorbis-tools' +} diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml index f5c10e8bce60..5c73baeac814 100644 --- a/app-cdr/cuetools/metadata.xml +++ b/app-cdr/cuetools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild index 1f49851b0089..5cd795c28741 100644 --- a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild +++ b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Program for converting the DAA and GBI files to ISO" -HOMEPAGE="http://aluigi.org/mytoolz.htm" -SRC_URI="http://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip" +HOMEPAGE="https://aluigi.org/mytoolz.htm" +SRC_URI="https://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip" +S="${WORKDIR}/src" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" -S=${WORKDIR}/src PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch ) src_configure() { @@ -25,6 +23,6 @@ src_configure() { } src_install() { - emake PREFIX="${ED%/}"/usr install + emake PREFIX="${ED}"/usr install einstalldocs } diff --git a/app-cdr/daa2iso/metadata.xml b/app-cdr/daa2iso/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/daa2iso/metadata.xml +++ b/app-cdr/daa2iso/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild index 6e832050733c..a1ac3c577040 100644 --- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild +++ b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file" HOMEPAGE="https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html" SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" SLOT="0" +KEYWORDS="amd64 ppc sparc x86" -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} +BDEPEND="dev-lang/perl" +RDEPEND="${BDEPEND} dev-perl/Audio-CD-disc-cover - virtual/latex-base -" + virtual/latex-base" src_compile() { pod2man disc-cover > disc-cover.1 || die @@ -24,8 +22,10 @@ src_compile() { src_install() { dobin disc-cover - dodoc AUTHORS CHANGELOG TODO + + einstalldocs doman disc-cover.1 - insinto /usr/share/${PN}/templates - doins templates/* + + insinto /usr/share/disc-cover/templates + doins -r templates/. } diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r3.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r3.ebuild new file mode 100644 index 000000000000..a548238ff238 --- /dev/null +++ b/app-cdr/disc-cover/disc-cover-1.5.6-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file" +HOMEPAGE="https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html" +SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" + +BDEPEND="dev-lang/perl" +RDEPEND="${BDEPEND} + dev-perl/Audio-CD-disc-cover + virtual/latex-base" + +PATCHES=( + "${FILESDIR}/${P}-defined-error.patch" +) + +src_compile() { + pod2man disc-cover > disc-cover.1 || die +} + +src_install() { + dobin disc-cover + + einstalldocs + doman disc-cover.1 + + insinto /usr/share/disc-cover/templates + doins -r templates/. +} diff --git a/app-cdr/disc-cover/files/disc-cover-1.5.6-defined-error.patch b/app-cdr/disc-cover/files/disc-cover-1.5.6-defined-error.patch new file mode 100644 index 000000000000..301167547970 --- /dev/null +++ b/app-cdr/disc-cover/files/disc-cover-1.5.6-defined-error.patch @@ -0,0 +1,10 @@ +--- disc-cover-1.5.6.orig/disc-cover 2006-06-20 14:16:24.000000000 +0200 ++++ disc-cover-1.5.6/disc-cover 2023-12-26 00:27:51.511140810 +0100 +@@ -743,7 +743,7 @@ + { + my ($error) = defined($_[0]) ? $_[0] : undef ; + shift; +- my (@solutions) = defined(@_) ? @_ : undef; ++ my (@solutions) = @_; + + warn "Error: $error\n" if defined ($error); diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml index 2eadb7c03808..9659a7052b8d 100644 --- a/app-cdr/disc-cover/metadata.xml +++ b/app-cdr/disc-cover/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription> diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest index bc403191484e..6ccdd0183bd1 100644 --- a/app-cdr/dolphin-plugins-mountiso/Manifest +++ b/app-cdr/dolphin-plugins-mountiso/Manifest @@ -1,2 +1,3 @@ -DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b -DIST dolphin-plugins-21.04.2.tar.xz 253184 BLAKE2B 2ca0bdbdd1e658bd54a95790d722e23817aca2af1bff16b5056686e58b5ce60aeaecba05ec3a2faf69ccf4d1c4dd7ee91f59cec37da3693917ed9144c4e48ae2 SHA512 379e87f0ee28dd414c1ffe1f2e7775681cf639cda72a6357c357f2a7a30aefee77cfc8b52cb4030ff68555a38d0abf428ac155cbd2d3263ac55b4f41b9ae1fda +DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8 +DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852 +DIST dolphin-plugins-24.02.2.tar.xz 298356 BLAKE2B e40f64b6a97961ba9f614ba2a795d42c460b65073e1ab5c502cbd87f4810e0e381562890646501446af544aec5e7f790be266ec41407ef156e8a27ac0ba0d555 SHA512 585249422ef1637c2caee044a71d11c621127ef578131d2323e879b12bee2f17082c4811273e6bb0013d1386f7010ded187627965bfce0b1b412b25048cd11d8 diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.2.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.04.3.ebuild index d0900ab81df2..757e800a8fd2 100644 --- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.2.ebuild +++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.04.3.ebuild @@ -1,24 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="false" -KDE_GEAR="true" KDE_ORG_CATEGORY="sdk" KDE_ORG_NAME="dolphin-plugins" MY_PLUGIN_NAME="mountiso" -KFMIN=5.80.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Dolphin plugin for ISO loopback device mounting" HOMEPAGE="https://apps.kde.org/dolphin_plugins/" -LICENSE="GPL-2" # TODO: CHECK +LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 x86" IUSE="" DEPEND=" @@ -39,12 +38,10 @@ RDEPEND="${DEPEND}" src_prepare() { ecm_src_prepare # kxmlgui, qtnetwork only required by dropbox - ecm_punt_bogus_dep Qt5 Network - ecm_punt_bogus_dep KF5 XmlGui + ecm_punt_qt_module Network + ecm_punt_kf_module XmlGui # delete non-${PN} translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die - fi + find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die } src_configure() { diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.08.5.ebuild index ba1a5e701209..31c30bf004dc 100644 --- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild +++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-23.08.5.ebuild @@ -1,24 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="false" -KDE_RELEASE_SERVICE="true" KDE_ORG_CATEGORY="sdk" KDE_ORG_NAME="dolphin-plugins" MY_PLUGIN_NAME="mountiso" -KFMIN=5.75.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Dolphin plugin for ISO loopback device mounting" HOMEPAGE="https://apps.kde.org/dolphin_plugins/" -LICENSE="GPL-2" # TODO: CHECK +LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 x86" IUSE="" DEPEND=" @@ -36,19 +35,13 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${P}-dont-mount-ISO-multiple-times.patch" # KDE-bug 434617 -) - src_prepare() { ecm_src_prepare # kxmlgui, qtnetwork only required by dropbox - ecm_punt_bogus_dep Qt5 Network - ecm_punt_bogus_dep KF5 XmlGui + ecm_punt_qt_module Network + ecm_punt_kf_module XmlGui # delete non-${PN} translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die - fi + find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die } src_configure() { diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.2.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.2.ebuild new file mode 100644 index 000000000000..11419012f809 --- /dev/null +++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-24.02.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="false" +KDE_ORG_CATEGORY="sdk" +KDE_ORG_NAME="dolphin-plugins" +MY_PLUGIN_NAME="mountiso" +KFMIN=6.0.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Dolphin plugin for ISO loopback device mounting" +HOMEPAGE="https://apps.kde.org/dolphin_plugins/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=kde-apps/dolphin-${PVCUT}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 +" +RDEPEND="${DEPEND}" + +src_prepare() { + ecm_src_prepare + # kxmlgui, qtnetwork only required by dropbox + ecm_punt_qt_module Network + ecm_punt_kf_module XmlGui + # delete non-${PN} translations + find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_${MY_PLUGIN_NAME}=ON + -DBUILD_bazaar=OFF + -DBUILD_dropbox=OFF + -DBUILD_git=OFF + -DBUILD_hg=OFF + -DBUILD_makefileactions=OFF + -DBUILD_svn=OFF + ) + ecm_src_configure +} + +src_install() { + ecm_src_install + rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die +} diff --git a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch deleted file mode 100644 index fc59e1718503..000000000000 --- a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001 -From: Kwon-Young Choi <kwon-young.choi@hotmail.fr> -Date: Fri, 19 Mar 2021 17:10:31 +0100 -Subject: [PATCH] BackingFile property should be use with StorageVolume instead - of StorageAccess - -BUG: 434617 - -When mounting an iso with `udisksctl`, first a loop device is created -`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on -a filesystem location. - -Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1` -device without the `/dev/loop0` device and the BackingFile property does not -work on `/dev/loop0p1`. - -Solution: query for StorageVolume instead which returns all loop devices: -`/dev/loop0` and `/dev/loop1`. - -Warning: Because StorageVolume returns more devices, the function -`getDeviceFromBackingFile` could be a little bit slower. ---- - mountiso/mountisoaction.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp -index e5575ae..d198a89 100644 ---- a/mountiso/mountisoaction.cpp -+++ b/mountiso/mountisoaction.cpp -@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &) - const Solid::Device getDeviceFromBackingFile(const QString &backingFile) - { - const QList<Solid::Device> blockDevices = -- Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]"); -+ Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]"); - - for (const Solid::Device &device : blockDevices) { - auto genericDevice = device.as<Solid::GenericInterface>(); --- -GitLab - diff --git a/app-cdr/dolphin-plugins-mountiso/metadata.xml b/app-cdr/dolphin-plugins-mountiso/metadata.xml index 2fdbf33d963d..858b75c358bc 100644 --- a/app-cdr/dolphin-plugins-mountiso/metadata.xml +++ b/app-cdr/dolphin-plugins-mountiso/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">sdk/dolphin-plugins</remote-id> + </upstream> </pkgmetadata> diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r4.ebuild index 7af0358a39a8..c501bba34847 100644 --- a/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild +++ b/app-cdr/dumpet/dumpet-2.1_p20140601-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs vcs-snapshot @@ -18,11 +18,11 @@ IUSE="test" #Restrict tests since required test file is unavailable RESTRICT="test" -RDEPEND="dev-libs/libxml2 +BDEPEND="virtual/pkgconfig + test? ( dev-debug/valgrind )" +DEPEND="dev-libs/libxml2 dev-libs/popt" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-util/valgrind )" +RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/musl-byteswap-fix.patch ) diff --git a/app-cdr/dumpet/metadata.xml b/app-cdr/dumpet/metadata.xml index 435234188908..2f9516722f51 100644 --- a/app-cdr/dumpet/metadata.xml +++ b/app-cdr/dumpet/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> +<upstream> + <remote-id type="github">rhboot/dumpet</remote-id> +</upstream> </pkgmetadata> diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild deleted file mode 100644 index f2e040ecf9d2..000000000000 --- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A set of tools for DVD+RW/-RW drives" -HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/" -SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="app-cdr/cdrtools" -DEPEND="${RDEPEND} - sys-devel/m4" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0-sysmacros.patch - "${FILESDIR}"/${PN}-7.0-wctomb-r1.patch - "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch - "${FILESDIR}"/${PN}-7.0-dvddl-r1.patch - "${FILESDIR}"/${PN}-7.0-wexit.patch - "${FILESDIR}"/${PN}-7.0-reload.patch - "${FILESDIR}"/${PN}-7.1-noevent.patch - "${FILESDIR}"/${PN}-7.1-lastshort.patch - "${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch - "${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch -) - -src_prepare() { - # Linux compiler flags only include -O2 and are incremental. - sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS" - default -} - -src_compile() { - emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" -} - -src_install() { - emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install - dodoc index.html -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - elog 'If you receive an error, "unable to anonymously mmap...' - elog 'Resource temporarily unavailable" when running growisofs,' - elog 'then you may need to run "ulimit -l unlimited".' - fi -} diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild index 90a625b3d8a0..51902767d327 100644 --- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild +++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.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 @@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="app-cdr/cdrtools" diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml index 6eb1c692fd55..b22a815172dd 100644 --- a/app-cdr/dvd+rw-tools/metadata.xml +++ b/app-cdr/dvd+rw-tools/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ceamac.paragon@gmail.com</email> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> <name>Viorel Munteanu</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> </pkgmetadata> diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild index 242cffbb8bb8..d94b33064532 100644 --- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild +++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -78,5 +78,5 @@ src_install() { ${dest}/man/${dvdi_lang/-/_} || die done - rm ${ED}/usr/bin/*-uninstall.sh || die + rm "${ED}"/usr/bin/*-uninstall.sh || die } diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml index f59f80021071..a7283599e150 100644 --- a/app-cdr/dvdisaster/metadata.xml +++ b/app-cdr/dvdisaster/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>gentoo@k8n.de</email> diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest deleted file mode 100644 index bec3a265f2b8..000000000000 --- a/app-cdr/dvdshrink/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06 diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild deleted file mode 100644 index e052a53b1fb1..000000000000 --- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop - -DESCRIPTION="Scriptable DVD copy software" -HOMEPAGE="http://dvdshrink.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk" - -RDEPEND=" - app-cdr/cdrtools - >=app-cdr/dvd+rw-tools-6.1 - >=app-text/gocr-0.40 - >=media-video/dvdauthor-0.6.11 - >=media-video/mjpegtools-1.8.0-r1 - >=media-video/subtitleripper-0.3.4-r1 - >=media-video/transcode-1.0.2-r2[dvd] - gtk? ( >=dev-perl/Gtk2-1.104 ) -" -DEPEND="" - -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch ) - -src_install() { - dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} - - use gtk && dobin usr/bin/xdvdshrink.pl - - insinto /usr/share - doins -r usr/share/applications/dvdshrink - - dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt} - - doicon usr/share/icons/{batchrip.xpm,dvdshrink.xpm} - use gtk && make_desktop_entry xdvdshrink.pl xDVDShrink ${PN} AudioVideo -} diff --git a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch deleted file mode 100644 index 8acbb70073e0..000000000000 --- a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/usr/bin/dvdsfunctions -+++ b/usr/bin/dvdsfunctions -@@ -1933,7 +1933,7 @@ - if ! ((`ps -C xdvdshrink.pl > /dev/null 2>&1`)); then GUI=1; fi - SAVEISO=0 # Save an ISO along with the burn(s) - -- APPDIR=/usr/share/applications/dvdshrink -+ APPDIR=/usr/share/dvdshrink - } - - # Build a minimal but usable XML file for 'dvdauthor' ---- a/usr/bin/xdvdshrink.pl -+++ b/usr/bin/xdvdshrink.pl -@@ -22,7 +22,7 @@ - - my $login = getlogin || getpwuid($<); # Userid of current user - my $homedir = "/home/" . $login; # Home dir of current user --my $app_dir = "/usr/share/applications/dvdshrink"; -+my $app_dir = "/usr/share/dvdshrink"; - my $false = 0; # A 'false' - my $true = 1; # A 'true' - my $srunning = 0; # Is the bash script running diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml deleted file mode 100644 index 51dfd57f535a..000000000000 --- a/app-cdr/dvdshrink/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription> -XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use -archival copies of DVD content on single-layer writable DVDs. -</longdescription> - <upstream> - <remote-id type="sourceforge">dvdshrink</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest index f460511db0de..b738e9b8ef90 100644 --- a/app-cdr/extract-xiso/Manifest +++ b/app-cdr/extract-xiso/Manifest @@ -1 +1 @@ -DIST extract-xiso-2.7.1.tar.gz 207518 BLAKE2B bf99e2555e85344db318bdedf0e6dfb80b5f8cd079dc2083ba94e06c62032235d88296909a1aa887180ce94ce9d80a6b39aab25ed99b04741951aed79c2e8cdb SHA512 a7153d96fa7cfb01dfa385a0984d94dc0fa5ac14ce9f7e2d50287b7e1edbb6a4ba84b6b874aa2628b1a82f23b30687958e411699487896cc48787f48e0e012c6 +DIST extract-xiso-2.7.1_p202204252159.tar.gz 26979 BLAKE2B e313f78a6c835cbb87467a4509c576e589e05103c5723ecf224b85e5ca6f55cbdcf290c98bc03a745e2a24b2eca3368aea7dffe894300312e2b6287873258f9b SHA512 459a69a95f9680fb4659e30a777694b1ea37087742885e2d06338eab985d9d5734b4571fe7222d1e11489457d584b9da999c2bfb455f3d5eadcf36c8e4c8d844 diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild deleted file mode 100644 index f4e6324db818..000000000000 --- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_PV=${PV/_beta/b} - -DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images" -HOMEPAGE="https://sourceforge.net/projects/extract-xiso" -SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz" -S="${WORKDIR}"/${PN} - -LICENSE="BSD-4" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -PATCHES=( - "${FILESDIR}"/${PN}-2.7.1-headers.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:__LINUX__:__linux__:' \ - *.[ch] */*.[ch] || die -} - -doit() { echo "$@"; "$@"; } - -src_compile() { - # Need _GNU_SOURCE here for asprintf prototype. - doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} \ - extract-xiso.c libftp-*/*.c -o extract-xiso || die -} - -src_install() { - dobin extract-xiso - dodoc README.TXT -} diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1_p202204252159.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1_p202204252159.ebuild new file mode 100644 index 000000000000..415fe71c6b8a --- /dev/null +++ b/app-cdr/extract-xiso/extract-xiso-2.7.1_p202204252159.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PV=${PV/_beta/b} + +DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images" +HOMEPAGE="https://sourceforge.net/projects/extract-xiso" +if [[ ${PV} == *_p* ]] ; then + SRC_URI="https://github.com/XboxDev/extract-xiso/archive/refs/tags/build-$(ver_cut 5).tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-build-$(ver_cut 5) +else + SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz" + S="${WORKDIR}"/${PN} +fi + +LICENSE="BSD-4" +SLOT="0" +KEYWORDS="amd64 ppc x86" diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch b/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch deleted file mode 100644 index 3de797050b43..000000000000 --- a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix missing prototype warnings - ---- a/libftp-5.0.1.modified.by.in/FtpLibrary.h -+++ b/libftp-5.0.1.modified.by.in/FtpLibrary.h -@@ -20,6 +20,7 @@ - extern "C" { - #endif - -+#include <ctype.h> - #include <errno.h> - #include <stdio.h> - #include <stdarg.h> -@@ -33,6 +34,7 @@ - #include <sys/time.h> - #include <sys/socket.h> - #include <arpa/ftp.h> -+#include <arpa/inet.h> - #include <arpa/telnet.h> - #include <netinet/in.h> - #include <netdb.h> diff --git a/app-cdr/extract-xiso/metadata.xml b/app-cdr/extract-xiso/metadata.xml index 76898570a70a..35c3ca39e60c 100644 --- a/app-cdr/extract-xiso/metadata.xml +++ b/app-cdr/extract-xiso/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">extract-xiso</remote-id> + <remote-id type="github">XboxDev/extract-xiso</remote-id> </upstream> </pkgmetadata> diff --git a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch index df7d99b9c31e..7d6ea908607a 100644 --- a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch +++ b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch @@ -26,7 +26,7 @@ -gaffitter: $(OBJS) gaffitter.cc Params.h - $(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS) -+gaffitter: $(OBJS) Params.h ++gaffitter: $(OBJS) ########################################################################### objs: $(OBJS) diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild index f3f46c1d5e98..2a5034f24572 100644 --- a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild +++ b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -9,7 +9,7 @@ SV="0.1.0" SCRIPTS="scripts-${SV}" DESCRIPTION="Genetic Algorithm File Fitter" -HOMEPAGE="http://gaffitter.sourceforge.net/" +HOMEPAGE="https://gaffitter.sourceforge.net/" SRC_URI=" mirror://sourceforge/${PN}/${P}.tar.bz2 scripts? ( mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )" diff --git a/app-cdr/gaffitter/metadata.xml b/app-cdr/gaffitter/metadata.xml index b827b22456a4..62701c1881b5 100644 --- a/app-cdr/gaffitter/metadata.xml +++ b/app-cdr/gaffitter/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <use> diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest index 158794f37924..8baf622dbbbc 100644 --- a/app-cdr/gcdemu/Manifest +++ b/app-cdr/gcdemu/Manifest @@ -1,2 +1 @@ -DIST gcdemu-3.2.4.tar.bz2 52209 BLAKE2B 620b1ea8616cf0d7f80954dd00ad1442b55fedafc5ff27ad5aa917e69a803a9629ccadb33ec3fdb2371c464bd484a15e85e00036dee5a67283fbf7e8d64e252c SHA512 920ab87a0b200f3f3983ff878871265084787f1468c042352c319ff3a37131547cc1e981801eefaee1e419ec306b026f7a18da165a17e3ddc6a92998a42e7b41 -DIST gcdemu-3.2.5.tar.xz 47960 BLAKE2B 8e45fe31461120b33080b9e40bd1def1c4ddfe562a9ca60814c66fbe073325d867692bd367e89e8281e34955eb232c37d8908a8962f5aa4587000b28c296d32b SHA512 d7e7b6ee1677213d858fca18103dd6d06e5de3f6c65fd16f19925b14ef50c73ebd0cbee3cb5c65aa5a59be3da1865f3e87b5e7c1a5921c496ae083727365e10b +DIST gcdemu-3.2.6.tar.xz 47968 BLAKE2B edbe8cb46ce020eec20b2740da99c35d3fd9727a1c65a5e6992de7876d55e24527c8c524e2ccc479a7ca01a0e68bff1488db2746838fc56ea29d424928c2338f SHA512 1ed08c159f5de9ed5ad850508356998ad17f4bbb17b111ba385c913f2058daa32d8e9cd7ae04cdeacca9c7f3004f29c3c6e995cfd14a7eb60bdb32489f49515e diff --git a/app-cdr/gcdemu/gcdemu-3.2.4.ebuild b/app-cdr/gcdemu/gcdemu-3.2.6-r1.ebuild index 1acd6707799c..10f7298db619 100644 --- a/app-cdr/gcdemu/gcdemu-3.2.4.ebuild +++ b/app-cdr/gcdemu/gcdemu-3.2.6-r1.ebuild @@ -1,37 +1,41 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake gnome2-utils python-single-r1 xdg-utils DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon" HOMEPAGE="https://cdemu.sourceforge.io" -SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.bz2" +SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # librsvg for pixbuf-loader -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} app-cdr/cdemu-daemon:0/7 $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] ') gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection]" -BDEPEND="${PYTHON_DEPS} + x11-libs/libnotify[introspection] +" +BDEPEND=" + ${PYTHON_DEPS} dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( AUTHORS README ) diff --git a/app-cdr/gcdemu/gcdemu-3.2.5.ebuild b/app-cdr/gcdemu/gcdemu-3.2.6.ebuild index 8652dfaf6c9b..178755cb9636 100644 --- a/app-cdr/gcdemu/gcdemu-3.2.5.ebuild +++ b/app-cdr/gcdemu/gcdemu-3.2.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake gnome2-utils python-single-r1 xdg-utils @@ -18,20 +18,24 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # librsvg for pixbuf-loader -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} app-cdr/cdemu-daemon:0/7 $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] ') gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection]" -BDEPEND="${PYTHON_DEPS} + x11-libs/libnotify[introspection] +" +BDEPEND=" + ${PYTHON_DEPS} dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" DOCS=( AUTHORS README ) diff --git a/app-cdr/gcdemu/metadata.xml b/app-cdr/gcdemu/metadata.xml index be81b6000604..503cdce610da 100644 --- a/app-cdr/gcdemu/metadata.xml +++ b/app-cdr/gcdemu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> diff --git a/app-cdr/geteltorito/metadata.xml b/app-cdr/geteltorito/metadata.xml index c665e48637be..10e4ea021b98 100644 --- a/app-cdr/geteltorito/metadata.xml +++ b/app-cdr/geteltorito/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ulm@gentoo.org</email> diff --git a/app-cdr/graveman/files/cflags.patch b/app-cdr/graveman/files/cflags.patch new file mode 100644 index 000000000000..45df210130fa --- /dev/null +++ b/app-cdr/graveman/files/cflags.patch @@ -0,0 +1,25 @@ +--- a/configure.in ++++ b/configure.in +@@ -23,7 +23,7 @@ + + + +-AC_INIT(configure.in) ++AC_INIT(configure.ac) + AC_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + +@@ -283,13 +283,6 @@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) + +-if test "A$enable_debug" = "A"; then +- enable_debug=no +- CFLAGS="-Wall" +-else +- CFLAGS="-Wall -g" +-fi +- + dnl Ecriture des fichiers + AC_OUTPUT([ m4/Makefile + Makefile diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch index 4a683d2c84ec..e2a678af8ba0 100644 --- a/app-cdr/graveman/files/desktop-entry.patch +++ b/app-cdr/graveman/files/desktop-entry.patch @@ -1,6 +1,5 @@ -diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in ---- graveman-0.3.12-5.orig/desktop/graveman.desktop.in 2005-05-24 00:07:08.000000000 +0300 -+++ graveman-0.3.12-5/desktop/graveman.desktop.in 2008-05-10 06:33:32.000000000 +0300 +--- a/desktop/graveman.desktop.in ++++ b/desktop/graveman.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch index 0b0f66656aa3..47f6ecf04011 100644 --- a/app-cdr/graveman/files/joliet-long.patch +++ b/app-cdr/graveman/files/joliet-long.patch @@ -1,5 +1,5 @@ ---- a/src/mkisofs.c.old 2005-05-28 02:37:14.000000000 +0200 -+++ b/src/mkisofs.c 2005-07-11 02:10:44.000000000 +0200 +--- a/src/mkisofs.c ++++ b/src/mkisofs.c @@ -91,13 +91,13 @@ } } diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch index 5970656a3c55..a2410354c23e 100644 --- a/app-cdr/graveman/files/rename.patch +++ b/app-cdr/graveman/files/rename.patch @@ -1,5 +1,5 @@ ---- a/src/callbacks.c.old 2006-05-23 17:42:48.642913000 +0200 -+++ b/src/callbacks.c 2006-05-23 17:42:52.553201500 +0200 +--- a/src/callbacks.c ++++ b/src/callbacks.c @@ -268,7 +268,7 @@ gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1); diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch index 570bc8406177..d0a9b3f2fac4 100644 --- a/app-cdr/graveman/files/sox.patch +++ b/app-cdr/graveman/files/sox.patch @@ -1,6 +1,5 @@ -diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c ---- a/src/sox.c 2005-05-28 02:37:14.000000000 +0200 -+++ b/src/sox.c 2007-01-27 18:22:11.000000000 +0100 +--- a/src/sox.c ++++ b/src/sox.c @@ -37,7 +37,7 @@ gboolean check_sox() { diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r5.ebuild index 4e5aefa550df..41a336d909ea 100644 --- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild +++ b/app-cdr/graveman/graveman-0.3.12_p5-r5.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools gnome2 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2" HOMEPAGE="http://graveman.tuxfamily.org/" SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz" +S="${WORKDIR}/${P/_p/-}" LICENSE="GPL-2" SLOT="0" @@ -22,38 +24,41 @@ RDEPEND=" x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) - flac? ( media-libs/flac ) - mp3? ( media-libs/libid3tag + flac? ( media-libs/flac:= ) + mp3? ( + media-libs/libid3tag:= media-libs/libmad - media-sound/sox ) + media-sound/sox + ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis - media-sound/sox ) -" -DEPEND="${RDEPEND} + media-sound/sox + )" +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${P/_p/-}" + nls? ( sys-devel/gettext )" src_prepare() { eapply \ "${FILESDIR}"/joliet-long.patch \ "${FILESDIR}"/rename.patch \ - "${FILESDIR}"/desktop-entry.patch + "${FILESDIR}"/desktop-entry.patch \ + "${FILESDIR}"/cflags.patch if use mp3 || use vorbis; then eapply "${FILESDIR}"/sox.patch fi # Fix tests - echo glade/dialog_media.glade >> po/POTFILES.in - echo glade/window_welcome.glade >> po/POTFILES.in - echo src/flac.c >> po/POTFILES.in + cat <<- EOF >> po/POTFILES.in || die + glade/dialog_media.glade + glade/window_welcome.glade + src/flac.c + EOF # Prevent m4_copy error when running aclocal # m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918 diff --git a/app-cdr/graveman/metadata.xml b/app-cdr/graveman/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/graveman/metadata.xml +++ b/app-cdr/graveman/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/iat/iat-0.1.7-r1.ebuild b/app-cdr/iat/iat-0.1.7-r1.ebuild index 1db342f25705..9fea3a8127c2 100644 --- a/app-cdr/iat/iat-0.1.7-r1.ebuild +++ b/app-cdr/iat/iat-0.1.7-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="BIN, MDF, PDI, CDI, NRG, and B5I converters" HOMEPAGE="https://www.berlios.de/software/iso9660-analyzer-tool" diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml index 54c7e8b9a521..9eb0a668e60e 100644 --- a/app-cdr/iat/metadata.xml +++ b/app-cdr/iat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest index 22e4570376c7..bde6e5d0f4aa 100644 --- a/app-cdr/isoimagewriter/Manifest +++ b/app-cdr/isoimagewriter/Manifest @@ -1 +1,2 @@ -DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199 +DIST isoimagewriter-1.0.0.tar.xz 451924 BLAKE2B cec34345811faa2d43f376ada085867856f7ab2473c070ed35db713fb627241a1c30c3b842c9b9329592f9f1f061e2f01db0dc63a381ad50c6b95b2b0c1b2733 SHA512 d50e8146cfde12d940ccfc1ed8ad71a69d203054e470d52e274589aa38d6fbdb018a79db4b63725c7b37acfedfa36b211cc79437e3f12668b8499d9ece3ee562 +DIST isoimagewriter-24.02.2.tar.xz 463144 BLAKE2B 7e53e2d2d94d8222ee416e7f942f84b4497263b4bc66a2ad81a49455d9376175b0f9d1461b99982fe54eaadaa03dfe85384b1f8644d6c34b6ac7ac2f9121e10a SHA512 7648e2c494dc8e1a5ef71ab767f474df083fa161427d25f3759811e87477ff103512eafa496f105daac41c249317479c16ccae3e49062cce962a4c1101baf834 diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild b/app-cdr/isoimagewriter/isoimagewriter-1.0.0.ebuild index 54df9ef3f20f..83e3a320faaa 100644 --- a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild +++ b/app-cdr/isoimagewriter/isoimagewriter-1.0.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.102.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="Write hybrid ISO files onto a USB disk" HOMEPAGE="https://community.kde.org/ISOImageWriter" if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" KEYWORDS="amd64" fi @@ -20,12 +20,19 @@ SLOT="5" IUSE="" DEPEND=" - app-crypt/gpgme[cxx,qt5] + app-crypt/gpgme:=[cxx(+),qt5] + >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qttest-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - virtual/libudev:= + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 +" +RDEPEND="${DEPEND} + sys-fs/udisks:2 " -RDEPEND="${DEPEND}" diff --git a/app-cdr/isoimagewriter/isoimagewriter-24.02.2.ebuild b/app-cdr/isoimagewriter/isoimagewriter-24.02.2.ebuild new file mode 100644 index 000000000000..f5edb72f8c62 --- /dev/null +++ b/app-cdr/isoimagewriter/isoimagewriter-24.02.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Write hybrid ISO files onto a USB disk" +HOMEPAGE="https://community.kde.org/ISOImageWriter" + +LICENSE="GPL-3" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=app-crypt/gpgme-1.23.1-r1:=[cxx(+),qt6] + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 +" +RDEPEND="${DEPEND} + sys-fs/udisks:2 +" diff --git a/app-cdr/isoimagewriter/metadata.xml b/app-cdr/isoimagewriter/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/app-cdr/isoimagewriter/metadata.xml +++ b/app-cdr/isoimagewriter/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> </pkgmetadata> diff --git a/app-cdr/isomaster/isomaster-1.3.16.ebuild b/app-cdr/isomaster/isomaster-1.3.16.ebuild index ada30c8db94b..4891c45cda6e 100644 --- a/app-cdr/isomaster/isomaster-1.3.16.ebuild +++ b/app-cdr/isomaster/isomaster-1.3.16.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 @@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" RDEPEND=">=dev-libs/iniparser-4.1:4 diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml index 6d2298876faa..6a22e9e318bb 100644 --- a/app-cdr/isomaster/metadata.xml +++ b/app-cdr/isomaster/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/app-cdr/kcdemu/kcdemu-0.8.0.ebuild b/app-cdr/kcdemu/kcdemu-0.8.0.ebuild index 48b3dc4d0496..6e367c588676 100644 --- a/app-cdr/kcdemu/kcdemu-0.8.0.ebuild +++ b/app-cdr/kcdemu/kcdemu-0.8.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="kde_cdemu" KFMIN=5.60.0 @@ -10,7 +10,8 @@ inherit ecm DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks" HOMEPAGE="https://www.linux-apps.com/p/998461/" -SRC_URI="mirror://sourceforge/project/kde-cdemu-manager/kde_cdemu-0.8.0.tar.bz2" +SRC_URI="mirror://sourceforge/project/kde-cdemu-manager/kde_cdemu-${PV}.tar.bz2" +S="${WORKDIR}/${MY_PN}" LICENSE="GPL-2" SLOT="5" @@ -32,5 +33,3 @@ DEPEND=" RDEPEND="${DEPEND} >=app-cdr/cdemu-2.0.0[cdemu-daemon] " - -S="${WORKDIR}/${MY_PN}" diff --git a/app-cdr/kcdemu/metadata.xml b/app-cdr/kcdemu/metadata.xml index 2fdbf33d963d..8641e5bdd399 100644 --- a/app-cdr/kcdemu/metadata.xml +++ b/app-cdr/kcdemu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> diff --git a/app-cdr/metadata.xml b/app-cdr/metadata.xml index 854d2c918b90..53db67dda67a 100644 --- a/app-cdr/metadata.xml +++ b/app-cdr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The app-cdr category contains software for writing CDs and DVDs, and for diff --git a/app-cdr/mirage2iso/metadata.xml b/app-cdr/mirage2iso/metadata.xml index 80f0436e5426..0933360adb2d 100644 --- a/app-cdr/mirage2iso/metadata.xml +++ b/app-cdr/mirage2iso/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> @@ -14,7 +14,7 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> - <bugs-to>https://github.com/mgorny/mirage2iso/issues/</bugs-to> - <remote-id type="github">mgorny/mirage2iso</remote-id> + <bugs-to>https://github.com/projg2/mirage2iso/issues/</bugs-to> + <remote-id type="github">projg2/mirage2iso</remote-id> </upstream> </pkgmetadata> diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild new file mode 100644 index 000000000000..e61b1d13f91d --- /dev/null +++ b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="CD/DVD image converter using libmirage" +HOMEPAGE="https://github.com/projg2/mirage2iso/" +SRC_URI=" + https://github.com/projg2/${PN}/releases/download/v${PV}/${P}.tar.xz + test? ( https://github.com/projg2/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="pinentry test" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/libmirage-2.0.0:0= + dev-libs/glib:2= + pinentry? ( dev-libs/libassuan:0= )" +RDEPEND="${DEPEND} + pinentry? ( app-crypt/pinentry )" +BDEPEND="virtual/pkgconfig" + +src_configure() { + econf $(use_with pinentry libassuan) +} diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild deleted file mode 100644 index c1efb10c0087..000000000000 --- a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="CD/DVD image converter using libmirage" -HOMEPAGE="https://github.com/mgorny/mirage2iso/" -SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz - test? ( https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pinentry test" - -COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0= - dev-libs/glib:2= - pinentry? ( dev-libs/libassuan:0= )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - pinentry? ( app-crypt/pinentry )" - -RESTRICT="!test? ( test )" - -src_configure() { - local myconf=( - $(use_with pinentry libassuan) - ) - - econf "${myconf[@]}" -} diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild index 117ba275a26e..6eaba9ee1d9f 100644 --- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild +++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild @@ -1,31 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git" inherit autotools git-r3 DESCRIPTION="CD/DVD image converter using libmirage" -HOMEPAGE="https://github.com/mgorny/mirage2iso/" -SRC_URI="" +HOMEPAGE="https://github.com/projg2/mirage2iso/" +EGIT_REPO_URI="https://github.com/projg2/mirage2iso.git" LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="pinentry test" +RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0= +DEPEND=" + >=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= )" -DEPEND="${COMMON_DEPEND} - dev-libs/libassuan - virtual/pkgconfig - test? ( app-arch/xz-utils )" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} pinentry? ( app-crypt/pinentry )" - -RESTRICT="!test? ( test )" +BDEPEND="virtual/pkgconfig" src_prepare() { default @@ -33,9 +28,5 @@ src_prepare() { } src_configure() { - local myconf=( - $(use_with pinentry libassuan) - ) - - econf "${myconf[@]}" + econf $(use_with pinentry libassuan) } diff --git a/app-cdr/mkcdtoc/metadata.xml b/app-cdr/mkcdtoc/metadata.xml index a9c94b2b4ae4..122cf9c09077 100644 --- a/app-cdr/mkcdtoc/metadata.xml +++ b/app-cdr/mkcdtoc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild b/app-cdr/mkcdtoc/mkcdtoc-1.0-r1.ebuild index c49089a56cab..0f8a1b52bd52 100644 --- a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild +++ b/app-cdr/mkcdtoc/mkcdtoc-1.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="command-line utility to create toc-files for cdrdao" HOMEPAGE="https://sourceforge.net/projects/mkcdtoc/" @@ -10,7 +10,20 @@ SRC_URI="mirror://sourceforge/mkcdtoc/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=">=dev-lang/perl-5.8.0" RDEPEND="${DEPEND}" + +src_compile() { + # bug #799164 + emake PREFIX="${EPREFIX}/usr" +} + +src_install() { + # bug #799164 + emake \ + PREFIX="${EPREFIX}/usr" \ + DESTDIR="${D}" \ + MANDIR="/usr/share/man" \ + install +} diff --git a/app-cdr/mp3burn/metadata.xml b/app-cdr/mp3burn/metadata.xml index 0ba258d88130..9b67ccbb4f18 100644 --- a/app-cdr/mp3burn/metadata.xml +++ b/app-cdr/mp3burn/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild index 40200fbbd700..962f81ab63d1 100644 --- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild +++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Burn mp3s without filling up your disk with .wav files" HOMEPAGE="https://sourceforge.net/projects/mp3burn" diff --git a/app-cdr/multicd/metadata.xml b/app-cdr/multicd/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/multicd/metadata.xml +++ b/app-cdr/multicd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r2.ebuild index aaba8ca308a8..6060d9c2af62 100644 --- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild +++ b/app-cdr/multicd/multicd-1.7.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Tool for making direct copies of your files to multiple cd's" HOMEPAGE="http://danborn.net/multicd/" @@ -10,12 +10,10 @@ SRC_URI="http://danborn.net/multicd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" RDEPEND=" app-cdr/cdrtools - >=dev-lang/perl-5.8.6 -" + dev-lang/perl" src_install() { dobin multicd diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest index 99cff6ce91c4..7df8c4076349 100644 --- a/app-cdr/nrg2iso/Manifest +++ b/app-cdr/nrg2iso/Manifest @@ -1,3 +1,4 @@ +DIST nrg2iso-0.4.1.tar.gz 14949 BLAKE2B e6468d966f0b3ff7913ee58a646abd8a389569e4694b169ba67dfe6d11ac4a17fd9ea2d883d1c53f19c978afa0e376343d635f85cc3e01ed2c47b4cdaf3d4eb1 SHA512 f84711cfbbfd74bdd81854b64b85054df5aa39b8667509d23a8483e665a814d66c7f83426d60849c17fc8b5bb6c2019f549ef6945bb3b000f647bb98dfea03e5 DIST nrg2iso-0.4.tar.gz 8553 BLAKE2B 2bd7907dc027c1bf602447c32f24f82d1627a90922aa32ebabecc15a3b3bb8d021f0dc3e13661351626a36365c76e325cded37046d7ac0f84ce6239c034a87e1 SHA512 fa9e081984345770fad713cdfc5711c8c9ace3981d1cc8130b4c2b83eca517c7765eaab758a34dd5e59846f24c6e3f76f3fc89e984305c4358859b0b28e1ec68 DIST nrg2iso-test.iso 55452 BLAKE2B c4bd651bde0bc66b781332cc186828fbe3fbff2c77150f5ac5cea5f42824b0016fd8b007991d94801a64edc43ce84e050a2db654380e3a0497b33d3abb11cdf5 SHA512 905c0b30482a3b411e786a4cc225dab7513a33c32bfd312717f4666543323456d2b6b6ddbeee75ed194e04cf28d472c87ffbdbf783c63abd06fae7e433601fba DIST nrg2iso-test.nrg 362652 BLAKE2B c122ae3b0c310e5c823ccbf33906135aa74f1001b02dc31f7fc0fa77b87b5627d31ea8746a64f0e8a2450e0ec20dc25f5fd72e202113237a95bc219f321c79df SHA512 c29f7e7d3f692a03fdbc5d0c1a112ead73efb45b102302f7f1685f9f2ccfe1eed9b690a3c3f1c7d7d79da9197fdb40dd06ca7bab4187e5dfca81d47268b550b7 diff --git a/app-cdr/nrg2iso/metadata.xml b/app-cdr/nrg2iso/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/app-cdr/nrg2iso/metadata.xml +++ b/app-cdr/nrg2iso/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r3.ebuild index 16c6a8f6cce1..487dbc003d53 100644 --- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild +++ b/app-cdr/nrg2iso/nrg2iso-0.4-r3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit toolchain-funcs DESCRIPTION="Convert CD images from nrg (Nero) to iso" HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html" -SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz +SRC_URI=" + http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz test? ( https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso https://yegortimoshenko.s3.amazonaws.com/${PN}-test.nrg @@ -18,19 +19,22 @@ SLOT="0" KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" -DOCS=( CHANGELOG ) + +src_configure() { + tc-export CC +} src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN} + emake nrg2iso } src_test() { einfo "checking that nrg -> iso matches the expected output" - "${S}/${PN}" "${DISTDIR}/${PN}-test.nrg" "${T}/${PN}-test.iso" || die "conversion failed" - diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso" + ./nrg2iso "${DISTDIR}"/nrg2iso-test.nrg "${T}"/nrg2iso-test.iso || die "conversion failed" + diff "${DISTDIR}"/nrg2iso-test.iso "${T}"/nrg2iso-test.iso || die "unexpected iso" } src_install() { - dobin ${PN} + dobin nrg2iso einstalldocs } diff --git a/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild new file mode 100644 index 000000000000..047667ce42e0 --- /dev/null +++ b/app-cdr/nrg2iso/nrg2iso-0.4.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Convert CD images from nrg (Nero) to iso" +HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html" +SRC_URI=" + http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz + test? ( + https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso + https://yegortimoshenko.s3.amazonaws.com/${PN}-test.nrg + )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +src_configure() { + tc-export CC +} + +src_compile() { + emake nrg2iso +} + +src_test() { + einfo "checking that nrg -> iso matches the expected output" + ./nrg2iso "${DISTDIR}"/nrg2iso-test.nrg "${T}"/nrg2iso-test.iso || die "conversion failed" + diff "${DISTDIR}"/nrg2iso-test.iso "${T}"/nrg2iso-test.iso || die "unexpected iso" +} + +src_install() { + dobin nrg2iso + einstalldocs +} diff --git a/app-cdr/plextor-tool/metadata.xml b/app-cdr/plextor-tool/metadata.xml index 88e61c666f36..0f71b7ee3d9f 100644 --- a/app-cdr/plextor-tool/metadata.xml +++ b/app-cdr/plextor-tool/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild index 0822d71769e4..a82714a6b525 100644 --- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild +++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive" -HOMEPAGE="http://plextor-tool.sourceforge.net/" +HOMEPAGE="https://plextor-tool.sourceforge.net/" SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2" S="${WORKDIR}"/${PN}/src diff --git a/app-cdr/tkdvd/metadata.xml b/app-cdr/tkdvd/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-cdr/tkdvd/metadata.xml +++ b/app-cdr/tkdvd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/uif2iso/metadata.xml b/app-cdr/uif2iso/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/app-cdr/uif2iso/metadata.xml +++ b/app-cdr/uif2iso/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild deleted file mode 100644 index 5c029a5a00fb..000000000000 --- a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit toolchain-funcs - -DESCRIPTION="Convert CD images from uif (MagicISO) to iso" -HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso" -SRC_URI="mirror://gentoo/${P}.zip - test? ( https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso - https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif )" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}" - -src_compile() { - emake CC="$(tc-getCC)" -C src -f - <<-'EOF' - CPPFLAGS += -DMAGICISO_IS_SHIT - LDLIBS = -lz - uif2iso: $(patsubst %.c,%.o,$(wildcard *.c)) - EOF -} - -src_test() { - einfo "checking that uif -> iso matches the expected output" - src/${PN} "${DISTDIR}/${PN}-test.uif" "${T}/${PN}-test.iso" # always returns 1 - diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso" -} - -src_install() { - dobin src/${PN} - dodoc ${PN}.txt README -} diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild new file mode 100644 index 000000000000..ae20184cc167 --- /dev/null +++ b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Convert CD images from uif (MagicISO) to iso" +HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso" +SRC_URI=" + mirror://gentoo/${P}.zip + test? ( + https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso + https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif + )" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" + +src_compile() { + emake CC="$(tc-getCC)" -C src -f - <<- 'EOF' + CPPFLAGS += -DMAGICISO_IS_SHIT + LDLIBS = -lz + uif2iso: $(patsubst %.c,%.o,$(wildcard *.c)) + EOF +} + +src_test() { + einfo "checking that uif -> iso matches the expected output" + src/uif2iso "${DISTDIR}"/uif2iso-test.uif "${T}"/uif2iso-test.iso # always returns 1 + diff "${DISTDIR}"/uif2iso-test.iso "${T}"/uif2iso-test.iso || die "unexpected iso" +} + +src_install() { + dobin src/uif2iso + dodoc uif2iso.txt README +} diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest deleted file mode 100644 index 844167fcc22c..000000000000 --- a/app-cdr/xbiso/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch deleted file mode 100644 index 0b867751c373..000000000000 --- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -6,13 +6,13 @@ - - dnl Checks for libraries. - dnl Replace `main' with a function in -lftp: --AC_CHECK_LIB(ftp, main,[LIBS="-DUSE_FTP -lftp"],AC_MSG_WARN([Warning libftp not found ftp features disabled])) - AC_CHECK_LIB(m, ceil,[LIBS="$LIBS -lm"],AC_MSG_ERROR([Error mlib is required])) --AC_ARG_ENABLE(ftp, --[ -+AC_ARG_ENABLE([ftp], -+ AS_HELP_STRING([--disable-ftp],[Disables all ftp features and libftp dependencies])) - -- --disable-ftp Disables all ftp features and libftp dependencies --],[LIBS=""]) -+AS_IF([test "x$enable_ftp" != "xno"], [ -+ AC_SEARCH_LIBS([FtpInit],[ftp],[CPPFLAGS+="-DUSE_FTP"],AC_MSG_ERROR([libftp not found])) -+]) - - dnl Checks for header files. - AC_CONFIG_HEADERS([config.h:config.h.in]) diff --git a/app-cdr/xbiso/metadata.xml b/app-cdr/xbiso/metadata.xml deleted file mode 100644 index e9f9bf30ab44..000000000000 --- a/app-cdr/xbiso/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">xbiso</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild deleted file mode 100644 index 6d770560ed44..000000000000 --- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="Xbox xdvdfs ISO extraction utility" -HOMEPAGE="https://sourceforge.net/projects/xbiso/" -SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -src_prepare() { - eapply_user - sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769 - eapply "${FILESDIR}/${P}-libs.patch" - mv configure.in configure.ac || die #426262 - eautoreconf -} - -src_configure() { - # for this package, interix behaves the same as BSD - [[ ${CHOST} == *-interix* ]] && append-flags -D_BSD - - econf --disable-ftp -} - -src_install() { - dobin xbiso - dodoc CHANGELOG README -} diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest index cd403a3fc812..0ad82cccfafa 100644 --- a/app-cdr/xcdroast/Manifest +++ b/app-cdr/xcdroast/Manifest @@ -1 +1 @@ -DIST xcdroast-0.98alpha16.tar.gz 3563666 BLAKE2B 781f06e89265e9f30ea651d39219d7083a2cfc2833bc2ab0b57d9f67de77b2eb8aa6755148cd259e3c188a72f07026ecda91d0bbe09af4b55c696c75274739e0 SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7 +DIST xcdroast-1.19.tar.gz 3448552 BLAKE2B 2e4e2b5119d5002870142d95345ddd33dad40c5a9d7517594da0dfd945bea012d5391b61fb6264d790aaaacf4de6b990fc77f4b40fab594ac1a5d2279dafa933 SHA512 79449353ba5a1be990366e85bd807e4ef35ec19f021986634ee9549608dca0e447b61dbbed0f30f588baac49fc6b93c055800bedb629ff77274d7da7c39d7881 diff --git a/app-cdr/xcdroast/files/cdda2wav_version.patch b/app-cdr/xcdroast/files/cdda2wav_version.patch deleted file mode 100644 index cd001e0ee7bf..000000000000 --- a/app-cdr/xcdroast/files/cdda2wav_version.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c ---- xcdroast-0.98+0alpha16~/src/io.c 2008-08-21 15:11:40.000000000 +0200 -+++ xcdroast-0.98+0alpha16/src/io.c 2009-12-29 22:54:08.571188849 +0100 -@@ -10062,6 +10062,7 @@ - - gint check_version_cdda2wav(gchar *match, gchar *found) { - gchar line[MAXLINE]; -+gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; -@@ -10076,32 +10077,38 @@ - } - - strcpy(line,""); -+ strcpy(vline,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ -+ /* only get first line */ -+ if (strcmp(vline,"") == 0) { -+ strncpy(vline, line, MAXLINE); -+ } - } - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); - } - -- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { -+ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { - /* failed to open - permission denied */ - return 2; - } - -- /* now line contains the version string of cdda2wav */ -+ /* now vline contains the version string of cdda2wav */ - /* try to extract the version number */ - -- p = strstr(line,"version"); -+ p = strstr(vline,"version"); - if (p != NULL) { - p = strtok(p+8, " _"); - if (p != NULL) { - strcpy(ver,p); - } - } else { -- p = strstr(line,"cdda2wav"); -+ p = strstr(vline,"cdda2wav"); - if (p != NULL) { - p = strtok(p+9, " "); - if (p != NULL) { diff --git a/app-cdr/xcdroast/files/disable_version_check.patch b/app-cdr/xcdroast/files/disable_version_check.patch deleted file mode 100644 index e72c4d0ddb36..000000000000 --- a/app-cdr/xcdroast/files/disable_version_check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/init.c 2016-07-08 12:00:17.705356781 +0200 -+++ b/src/init.c 2016-07-08 12:02:35.914358133 +0200 -@@ -790,7 +790,7 @@ - debug = 0; - oldfontcode = 0; - *altdevscan = 1; -- no_versioncheck = 0; -+ no_versioncheck = 1; - support_ontheflyaudio = 0; - c_locale_is_utf8 = 0; - ignoreProDVD = 0; diff --git a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch deleted file mode 100644 index ca532f20d359..000000000000 --- a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/src/io.c -+++ b/src/io.c -@@ -2665,6 +2665,8 @@ - g_error("Unexpected output in cdda2wav toc-output\n"); - } - trackinfo[tocnr]->track_nr = atoi(p1); -+ if (trackinfo[tocnr]->track_nr == 0) -+ cdinfo.nr_tracks++; - trackinfo[tocnr]->isosize = -1; - - /* reststring into tmp2 - strip to remove leading spaces */ -@@ -8401,6 +8403,9 @@ - if (extract_quoted(tmp) != 0) - return; - -+ if (matchnr == 0 && trackinfo[matchnr]->track_nr == 0) -+ matchnr++; -+ - if (mode == 0) { - if (matchnr >= cdinfo.nr_tracks) { - g_warning("invalid track count from cddb-server\n"); -@@ -8482,14 +8487,20 @@ - - /* build of command line */ - if (mode == 0 || mode == 2) { -+ gint ntr = cdinfo.nr_tracks; -+ -+ if (ntr > 0 && trackinfo[0]->track_nr == 0) -+ ntr--; - g_snprintf(tmp,MAXLINE,"cddb query %s %d ", -- cdinfo.cddb_discid, cdinfo.nr_tracks); -+ cdinfo.cddb_discid, ntr); - for (i = 0; i < cdinfo.nr_tracks; i++) { -+ if (trackinfo[i]->track_nr == 0) -+ continue; - g_snprintf(tmp2,MAXLINE,"%d ", - trackinfo[i]->start_sec + 150); - strcat(tmp,tmp2); - } -- g_snprintf(tmp2,MAXLINE,"%d",cdinfo.total_size / 75); -+ g_snprintf(tmp2,MAXLINE,"%d",(cdinfo.leadout + 150) / 75); - strcat(tmp,tmp2); - } else { - /* get data from toc file */ - diff --git a/app-cdr/xcdroast/files/format-security.patch b/app-cdr/xcdroast/files/format-security.patch deleted file mode 100644 index 9d01cf4f7758..000000000000 --- a/app-cdr/xcdroast/files/format-security.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xcdroast-0.98alpha16/src/setup.c.orig 2008-08-21 12:07:18.000000000 +0400 -+++ xcdroast-0.98alpha16/src/setup.c 2016-07-09 11:26:54.724084818 +0300 -@@ -4468,7 +4468,7 @@ - if (!textonly) { - show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); - } else { -- g_warning(tmp); -+ g_warning("%s",tmp); - } - } - } diff --git a/app-cdr/xcdroast/files/io_compile.patch b/app-cdr/xcdroast/files/io_compile.patch deleted file mode 100644 index 339523d42f75..000000000000 --- a/app-cdr/xcdroast/files/io_compile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/io.c.org 2009-02-24 09:38:27.000000000 +0100 -+++ b/src/io.c 2009-02-24 09:45:18.000000000 +0100 -@@ -1903,7 +1903,8 @@ - } - - strcpy(str,""); -- fgets(str,MAXLINE,fpin); -+ if (fgets(str,MAXLINE,fpin) == NULL) -+ g_error("fgets error\n"); - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); -@@ -4720,7 +4721,7 @@ - dolog(3, "Saving extended output to %s\n", fname); - - /* write to file */ -- fd = open(fname,O_WRONLY | O_CREAT); -+ fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (fd < 0) { - g_warning("Can't open file %s for writing\n",fname); - return 1; diff --git a/app-cdr/xcdroast/files/io_progressbar_fix.patch b/app-cdr/xcdroast/files/io_progressbar_fix.patch deleted file mode 100644 index 745af45d7e73..000000000000 --- a/app-cdr/xcdroast/files/io_progressbar_fix.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/io.c.last So. Jan 24 19:18:45 2010 -+++ b/src/io.c Fr. Jul 16 10:59:32 2010 -@@ -3202,6 +3202,8 @@ - close(fd2[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup child */ - if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) { - g_error("execl error\n"); -@@ -3402,6 +3404,8 @@ - close(fd3[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup child */ - if (execv(callpath,arglist) < 0) { - g_error("execv error\n"); -@@ -3506,6 +3510,8 @@ - close(pipefd[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup first child */ - if (execv(callpath,arglist) < 0) { - g_error("execv error\n"); -@@ -3568,6 +3574,8 @@ - close(fd3[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup second child */ - if (execv(callpath2,arglist2) < 0) { - g_error("execv error\n"); - diff --git a/app-cdr/xcdroast/files/suid-perms.patch b/app-cdr/xcdroast/files/suid-perms.patch deleted file mode 100644 index 1c804bc1775c..000000000000 --- a/app-cdr/xcdroast/files/suid-perms.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naurd xcdroast-0.98alpha16.orig/doc/README.nonroot xcdroast-0.98alpha16/doc/README.nonroot ---- xcdroast-0.98alpha16.orig/doc/README.nonroot 2003-10-27 23:37:40.000000000 +0300 -+++ xcdroast-0.98alpha16/doc/README.nonroot 2016-07-07 21:32:35.006587826 +0300 -@@ -72,7 +72,7 @@ - Please change now to the corresponding directory and enter: - - chown root xcdrwrap -- chmod 4755 xcdrwrap -+ chmod 4711 xcdrwrap - - - Usage of the non-root-mode -diff -Naurd xcdroast-0.98alpha16.orig/src/init.c xcdroast-0.98alpha16/src/init.c ---- xcdroast-0.98alpha16.orig/src/init.c 2008-08-20 20:20:23.000000000 +0400 -+++ xcdroast-0.98alpha16/src/init.c 2016-07-07 21:32:35.006587826 +0300 -@@ -670,7 +670,7 @@ - - /* check file mode of wrapper */ - if (stat(tmp,&buf) == 0) { -- if (buf.st_mode != 0104755) { -+ if (buf.st_mode != 0104711) { - dodebug(3,"Note: %s wrong modes set (0%o)\n", tmp, buf.st_mode); - nofail = 0; - } -diff -Naurd xcdroast-0.98alpha16.orig/src/io.c xcdroast-0.98alpha16/src/io.c ---- xcdroast-0.98alpha16.orig/src/io.c 2008-08-21 17:11:40.000000000 +0400 -+++ xcdroast-0.98alpha16/src/io.c 2016-07-07 21:32:35.003587931 +0300 -@@ -10380,7 +10380,7 @@ - strcat(ret,tmp); - #endif - /* old nonroot mode - 2755 */ -- g_snprintf(tmp,MAXLINE,"%s 4755 %s\n", cmd_chmod, bin); -+ g_snprintf(tmp,MAXLINE,"%s 4711 %s\n", cmd_chmod, bin); - strcat(ret,tmp); - - diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml index a9df84a80882..ae251482af1b 100644 --- a/app-cdr/xcdroast/metadata.xml +++ b/app-cdr/xcdroast/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xcdroast</remote-id> </upstream> diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild deleted file mode 100644 index 5302219832b5..000000000000 --- a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop gnome2-utils - -DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing" -HOMEPAGE="http://www.xcdroast.org/" -SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="nls suid" - -RDEPEND=">=x11-libs/gtk+-2:2 - app-cdr/cdrtools" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -S=${WORKDIR}/${P/_/} - -PATCHES=( - "${FILESDIR}"/cdda2wav_version.patch - "${FILESDIR}"/fix_cddb_hidden_tracks.patch - "${FILESDIR}"/io_compile.patch - "${FILESDIR}"/io_progressbar_fix.patch - "${FILESDIR}"/suid-perms.patch - "${FILESDIR}"/disable_version_check.patch - "${FILESDIR}"/format-security.patch -) - -src_prepare() { - default - - # fix Norwegian locales - mv po/{no,nb}.po || die - mv po/{no,nb}.gmo || die - sed -i -e 's/no/nb/' po/LINGUAS || die -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable suid nonrootmode) \ - --enable-gtk2 \ - --mandir=/usr/share/man \ - --sysconfdir=/etc -} - -src_compile() { - emake PREFIX=/usr -} - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install - dodoc -r AUTHORS ChangeLog README doc/* - - insinto /usr/share/icons/hicolor/48x48/apps - newins xpms/xcdricon.xpm xcdroast.xpm - - make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild new file mode 100644 index 000000000000..0f851eefc3d9 --- /dev/null +++ b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg + +DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing" +HOMEPAGE="http://www.xcdroast.org/" +SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz" +S="${WORKDIR}"/${P/_/} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" +IUSE="nls suid" + +RDEPEND=">=app-cdr/cdrtools-3.02_alpha09 + media-libs/alsa-lib + >=x11-libs/gtk+-2:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + nls? ( sys-devel/gettext )" + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable suid user-host-mode) +} + +src_install() { + default + + dodoc -r AUTHORS ChangeLog README doc/* + + newicon -s 48 xpms/ico_cdwriter.xpm xcdroast.xpm + make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning" +} diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest index 55ac41f25642..fcd2fce806ef 100644 --- a/app-cdr/xfburn/Manifest +++ b/app-cdr/xfburn/Manifest @@ -1 +1 @@ -DIST xfburn-0.6.2.tar.bz2 869745 BLAKE2B ed8658d729dc0cf1ee40773fa82baf9a5301225bce4c971201ae8d21bffb74e81fb9d1b674f8b9e0bc55585a3fc9f380a0aa3718173ce7425d40f3dfcd4e1fb6 SHA512 c74d21244b5029aaa72c4911ea7549458aea161623a6a020a165b8148f320053a83189de87f71192f006579ca435558d0c07e1a8aa4165db8cfb30581f8882b4 +DIST xfburn-0.7.0.tar.bz2 923498 BLAKE2B 27c80f20306b1097f4d9176c2b9278b6ec5628eda6c36779270eca4fb2387ca425450201d6a4ae171aa8ce2fa50243614ae30d4561c72e3b70727cfcf54c7c34 SHA512 5ac679926809839d36c94d918ebc9bb409b9940127eba1cae6daf6614288f5d18181be5b7b4d249f0f0e973c2a4a22b8b3ce5709a2d23e5d4dd3b412cf5846d1 diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml index 88aa9ba02394..b2c57c5840fd 100644 --- a/app-cdr/xfburn/metadata.xml +++ b/app-cdr/xfburn/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>xfce@gentoo.org</email> diff --git a/app-cdr/xfburn/xfburn-0.6.2.ebuild b/app-cdr/xfburn/xfburn-0.7.0.ebuild index d81b8d65fea4..cdac611d349b 100644 --- a/app-cdr/xfburn/xfburn-0.6.2.ebuild +++ b/app-cdr/xfburn/xfburn-0.7.0.ebuild @@ -1,33 +1,50 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit xdg-utils DESCRIPTION="GTK+ based CD and DVD burning application" -HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn" +HOMEPAGE=" + https://docs.xfce.org/apps/xfburn/start + https://gitlab.xfce.org/apps/xfburn/ +" SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm ~ppc x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86" IUSE="gstreamer +udev" -RDEPEND=">=dev-libs/glib-2.32:= +DEPEND=" + >=dev-libs/glib-2.38:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-3.20:3= - >=xfce-base/exo-0.11:= - >=xfce-base/libxfce4ui-4.12:= + >=xfce-base/exo-0.11.0:= + >=xfce-base/libxfce4ui-4.12.0:= gstreamer? ( media-libs/gstreamer:1.0= - media-libs/gst-plugins-base:1.0= ) - udev? ( dev-libs/libgudev:= )" -DEPEND="${RDEPEND} + media-libs/gst-plugins-base:1.0= + ) + udev? ( dev-libs/libgudev:= ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" dev-util/intltool sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" + +src_prepare() { + # fix bashism + # https://gitlab.xfce.org/apps/xfburn/-/merge_requests/36 + sed -i -e 's:== x:= x:' configure || die + default +} src_configure() { local myconf=( |