gentoo auto-resync : 27:07:2022 - 03:00:38

7 files changed, 54 insertions, 28 deletions

diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 9c93cbbc54f7..2f49fa2e3cb9 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -1,7 +1,8 @@
-AUX desktop-entry.patch 544 BLAKE2B 8d02275e4dcbc4819f252b4493da4808384b2f036e0e208411bd9d734cca1802cee3c141cb0f2f4939f3286e146be9c4bbe13b8e1bf652a156d54eab377e0aba SHA512 92c46a60de5676e0fbb4a22c0e382586b0ac165ad9346f6dd4363c9ec6b19225f80755605bdcf25fdbb834d0868c7040703847797f3b835bde0849be5a08204f
-AUX joliet-long.patch 796 BLAKE2B 308e8471cbbcd2767370c452417d64bad6839126f95a4ed68c005074fb7daef85dc28076615679c1ba507a3091115e4a07ae4e6596492addb4101cdc71f72123 SHA512 cc3280b8eb0f79c89e70cdee5852119d8c13165483222fc1c750b65bfbeb081de9153387f30113ef90e553f18a5ef9625f4bd5737bd6fba521e3846294d27ade
-AUX rename.patch 505 BLAKE2B a7794bdc1a45b34fee773fb0482054b80506d7865c98e7c88f5995c3c4ee377086470d8288640f7e9686e208ba43e49ca2631348d709fa48357ceb815ec5218e SHA512 5ae9769ddd1c26a34d155d38ec2dede550e63be6fa7cb7f8a3cdd7b289aadce370c3f015bac91d0379b20f9f5a2265daff6f69b22350df9486b515c956d7abf5
-AUX sox.patch 1396 BLAKE2B c6f193498e8086111a90aa0811e4d3396c743722a8c31ac8286d37d3bf98d17bb12bd505574af2fc10633a796cdc5bf07924ebd7a2bf63e2fc8cb470feaa8ccb SHA512 545e3439a81e131a704c53e0c5a016d32a99e5bbda788ef5f3a6b1819cac7f4d5b98688e3738f3e6f1440eaba3a69efc1b2718edd578c9e4499166e4d527bd2d
+AUX cflags.patch 453 BLAKE2B 834bc5e8713616c445aaf38c0e0f40c23e9e1b8ac9b45608d3d503fa7fa12a1cc3b219d78295789c3fbba3ed638a3052d9b56105835355ec79878e274d9b8844 SHA512 6a563d78b173663ef7750ee189a576164a61b386ab7ea74325fa5fd48d656bf64fda5d02be5efa9dd7fb883ce4bccca9c1efb63e979c22976cc0c29da53ca20e
+AUX desktop-entry.patch 329 BLAKE2B 4280f5ea838eb488ac83996b364d0a3ee4f26dd5fe374376d315d8130c343ae127bec41217844f72e917dfb11dd38b88113bafaf68f4f6ad59af224bbd54ca7d SHA512 5f909042ee1835f2d208d1df7b271b503c30e854c1df36783c308a9650b3e67c4e6beae735948f84624ae212977e88d17deb7d592f12e82c73b2ba60fa63eb05
+AUX joliet-long.patch 720 BLAKE2B b248bd3973cd827914d52161726125485c55b3223d214821082e4c4f67e6a3577e28cad2654f681c310ea67b7e85a1b1f5fca7ccbc651e20dc3c8f1c3ff6766e SHA512 9f69cc29dadad9d35c44aa5f77ac0555ebc6c61dee003c263273fda325bd310d3c6fcc2b87dabd5742839dd1bb90244d755315e643e5a8b8b3d7bbda1e73c74e
+AUX rename.patch 429 BLAKE2B c91c1d010366c0ec0a44e38528a4b1a53b28da0342ce690ea9e7966c4f29e8af55cea8e201a8983bc3c38790de94842d897ca41429798462b7118271447bd13a SHA512 16c5b75aa8196f21194bbd81a4aaf5fa00d0081bc944ef590b0e2df6f9f0ede982e30fc0f114d1672311dbb4d72f367fc985b96787948437b4bc70dadb2ea8e1
+AUX sox.patch 1232 BLAKE2B bd3dbdfcd81583063dbe3c66ff4d4fde43523512e2cb037ab83e0e0655587f7fb9e643ef2440cc514c69801e32c7f1ec84c04a50efa18b95dc7295cda9870cdf SHA512 cfd26fd5497dc887bc885871b71a88bc2e28566de3b7d0f949fab15752145859c5fa96fb680e3f765c559f3889bb788f3eafd9bc0164d03a77f7d29b93fbf7ab
 DIST graveman-0.3.12-5.tar.gz 962523 BLAKE2B b7650c79ccd379ede48d9b1a9abbb1504e88e787feaf7897f50509d92ff51171e366e99bba4c9f9d153d92b4bbc5970b9775064e7f482fb0b1ccf12e5e50c4e0 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4
-EBUILD graveman-0.3.12_p5-r3.ebuild 1669 BLAKE2B c24ace1a1b5c3d2b4c9932aa06a550951eab47696e32f905ca6e81abe7d485d1ce33bf983e395f41be890cdf578f4e99c6b43ecbf2d7899497bea4d36436dac8 SHA512 ff5242c43e21ca828bfd4f4e15db679c3583b8b6a7e3f76ec94442c74d8a72197e3698cf119c19376682af2e74998162d4e8b2860054c1bcc7d0506ef7625d13
+EBUILD graveman-0.3.12_p5-r4.ebuild 1686 BLAKE2B 586a11e8d9ad3d8650b312eaa6d0b3e4021c7963a58a00b77768696d7928c91c710cc5000708967b81d83a0b45c322bf278a378e1237fb3d04d36b11b38207e7 SHA512 a725bb6b41c439826cb5be7b2db5002186250001a2ba9e784956c0c9225b11ceb60bcef3ce5f2ac3badcacf450f1e79110e221fb4a1e7fc64c2af418b13937e8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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-r3.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild
index d9adf8a2b0cb..47779a863ae3 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r4.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"
@@ -33,30 +35,30 @@ RDEPEND="
 		media-libs/libogg
 		media-libs/libvorbis
 		media-sound/sox
-	)
-"
-DEPEND="${RDEPEND}
+	)"
+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