gentoo resync : 05.02.2020

3 files changed, 51 insertions, 45 deletions

diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 16b8e0d4550e..4ced1df41b83 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -3,8 +3,8 @@ AUX 101_fix-buffer-overflow.diff 614 BLAKE2B a41edfc4a29b45adeb67923eeb5fe386e17
 AUX orpheus-1.6-bufsize.patch 590 BLAKE2B bd1748e80d5133f16d7394b7286a30047c245a81f38c30f2f3f2f897e7dc953d30e0259e5c6d20cb6cfa5a20d2ac5255b9f0d793770893332ea677ee907ee8cc SHA512 47e166074a585657bf49c7b3af33c2849dacbc737872ee6abd70891fddd7e8c63cf293e1180cd0f04077dcd6def495203103e92ca78a87564dcec56c0ea2f4e3
 AUX orpheus-1.6-constify.patch 2123 BLAKE2B 9842e55e4b0418f77e7f88f045e55eb953533f4a4cdeac3e49fd5d2f9369b3c328b0905555c8a0bc6acb9ac10f762230e17b25d0479247a9a119382eee2e7af4 SHA512 9e4ba5e66f65994462098f1b20208bb668e97acab3e95262ddf814879130bf3ff3caaee829631354784326b276ac23ff68dfa62374d43c8679c8beeebcd4d21b
 AUX orpheus-1.6-cppflags.patch 830 BLAKE2B a5a4d8ca2633fe31bf1b3917e7004578187ef8677a99cecb870e9e181276a2f9a03518989caf2816c52dd07c168cc6d2104b59b9d326786dd0d895a1a4633181 SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f
-AUX orpheus-1.6-fix-buildsystem.patch 4231 BLAKE2B 4492870937746e814fc4784cbf4c6c71659c058d1547f87d298a9bb358f50172aa12c41c387d7c2bd32840552878becf1e6cf1b3305cb05f1fbf300f2884280c SHA512 829048f8d327751e78e23fb4304a0b1a9308521bcd47b23dc15015c9ce4a2d36533a6fff18d8903a107c63131bffdb89851088c53bb28ade769245c1dd25e225
+AUX orpheus-1.6-fix-buildsystem.patch 4346 BLAKE2B 30fd0a668a6903c1b6f285c096caa096efcd187c138a2d304e591f3543d13ff5112949852c1ffc23043a3f2f98fd1c397baeec1555506a70973125a03d86fdca SHA512 fa05fec6ec5280a2a0289c55eaac5ca84286731cff2ceb294e645a0b69415fee785ad203169a455019dbebe89e700314821779c1d81d13dc21d6ccac7109ba63
 AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe478ace3d290ce0fdd5446e01ab496e0e57d5ff86e6039397c2e797d086485f8c3f3f8ec85aa1592ef294c2c16 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7
 DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
-EBUILD orpheus-1.6-r3.ebuild 981 BLAKE2B 2294c1ad4f7e5cd8e14096b6448b8bcbcff6799c74dbbe77c41b5b30d011d8c6b1bbb6c11aec558ced3c401994758b24fad3743cd0ba1558fc71d162b86834df SHA512 a88c4f1fbab4be4c78a390e949ab1ec22a20104c2a3436e448b41c7c1eae64f7c4ea166b7871717733fa9b3440a64b09552d84ea8b96ee968de23f1dddb02176
+EBUILD orpheus-1.6-r3.ebuild 913 BLAKE2B 6f068cca608943190a12e37d6adac09095d333478a8b90ed8d4269f056d35a84852b432b551bd8a31d51ba2352b929128733303be95a26b947147bfe6167db73 SHA512 add3909c566097b196e57335934889565d0a451c9c6513bd79a04798ced53a1dc4177e764568b3f62528fedc1ac840aeeab86f77c08be1d734b8e430a3fd604a
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
index 5819fe9a053c..35f229ed3cfe 100644
--- a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
@@ -1,5 +1,5 @@
---- orpheus-1.6/configure.ac
-+++ orpheus-1.6/configure.ac
+--- a/configure.in
++++ b/configure.in
 @@ -1,5 +1,5 @@
 -AC_INIT(aclocal.m4)
 -AM_INIT_AUTOMAKE(orpheus, 1.6)
@@ -18,7 +18,7 @@
  
  ###     use option --enable-locales-fix to fix problems with double-byte
  ###     encodings on systems with broken locale, iscntrl()
-@@ -20,30 +20,21 @@
+@@ -20,30 +21,21 @@
  
  AC_CHECK_HEADERS(sys/soundcard.h soundcard.h machine/soundcard.h, break)
  
@@ -54,13 +54,14 @@
 +LIBS="$LIBS $LIBICONV $DEPENDENCIES_LIBS"
  
  ALL_LINGUAS="ru ca"
- AM_GNU_GETTEXT
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
  AC_CONFIG_SUBDIRS(kkstrtext-0.1 kkconsui-0.1)
 -AC_OUTPUT(Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile)
 +AC_CONFIG_FILES([Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile])
 +AC_OUTPUT
---- orpheus-1.6/kkconsui-0.1/configure.ac
-+++ orpheus-1.6/kkconsui-0.1/configure.ac
+--- a/kkconsui-0.1/configure.in
++++ b/kkconsui-0.1/configure.in
 @@ -6,7 +6,7 @@
  AC_PROG_CC
  AC_PROG_CXX
@@ -70,8 +71,8 @@
  
  ###	use option --enable-locales-fix to fix problems with double-byte
  ###	encodings on systems with broken locale, iscntrl()
---- orpheus-1.6/kkstrtext-0.1/configure.ac
-+++ orpheus-1.6/kkstrtext-0.1/configure.ac
+--- a/kkstrtext-0.1/configure.in
++++ b/kkstrtext-0.1/configure.in
 @@ -6,6 +6,7 @@
  AC_PROG_CC
  AC_PROG_CXX
@@ -80,8 +81,16 @@
  
  AC_CHECK_HEADERS(_G_config.h)
  AC_LANG_CPLUSPLUS
---- orpheus-1.6/po/Makefile.in.in
-+++ orpheus-1.6/po/Makefile.in.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = kkstrtext-0.1 kkconsui-0.1 intl po src
++SUBDIRS = kkstrtext-0.1 kkconsui-0.1 po src
+ dist-hook:
+ 	cd $(top_distdir); subs=`egrep "^[:space:]*SUBDIRS" Makefile.am | sed 's/SUBDIRS[ =]\+//g'`; \
+ 	echo "SUBDIRS = kkstrtext-0.1 kkconsui-0.1 $$subs" >>.makefile.am; \
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
 @@ -29,7 +29,7 @@
  
  INSTALL = @INSTALL@
@@ -91,8 +100,8 @@
  mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
  
  GMSGFMT = @GMSGFMT@
---- orpheus-1.6/src/cdtrack.cc
-+++ orpheus-1.6/src/cdtrack.cc
+--- a/src/cdtrack.cc
++++ b/src/cdtrack.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -102,8 +111,8 @@
  #include "cdtrack.h"
  #include "playlist.h"
  
---- orpheus-1.6/src/main.cc
-+++ orpheus-1.6/src/main.cc
+--- a/src/main.cc
++++ b/src/main.cc
 @@ -21,6 +21,9 @@
  * USA
  *
@@ -114,8 +123,8 @@
  #include "uitext.h"
  #include "cdtrack.h"
  #include "mp3track.h"
---- orpheus-1.6/src/mp3track.cc
-+++ orpheus-1.6/src/mp3track.cc
+--- a/src/mp3track.cc
++++ b/src/mp3track.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -125,8 +134,8 @@
  #include "mp3track.h"
  #include "orpheusconf.h"
  
---- orpheus-1.6/src/oggtrack.cc
-+++ orpheus-1.6/src/oggtrack.cc
+--- a/src/oggtrack.cc
++++ b/src/oggtrack.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -136,8 +145,8 @@
  #include "oggtrack.h"
  #include "orpheusconf.h"
  
---- orpheus-1.6/src/orpheusconf.cc
-+++ orpheus-1.6/src/orpheusconf.cc
+--- a/src/orpheusconf.cc
++++ b/src/orpheusconf.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -147,8 +156,8 @@
  #include "orpheusconf.h"
  
  #include <sys/stat.h>
---- orpheus-1.6/src/playlist.cc
-+++ orpheus-1.6/src/playlist.cc
+--- a/src/playlist.cc
++++ b/src/playlist.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -158,8 +167,8 @@
  #include "playlist.h"
  #include "mp3track.h"
  #include "oggtrack.h"
---- orpheus-1.6/src/streamtrack.cc
-+++ orpheus-1.6/src/streamtrack.cc
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
 @@ -22,6 +22,8 @@
  *
  */
@@ -169,8 +178,8 @@
  #include "streamtrack.h"
  #include "playlist.h"
  
---- orpheus-1.6/src/uitext.cc
-+++ orpheus-1.6/src/uitext.cc
+--- a/src/uitext.cc
++++ b/src/uitext.cc
 @@ -22,6 +22,8 @@
  *
  */
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
index d56b810a1026..cd2786b8a7b5 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,26 +21,23 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/1.5-amd64.patch"
-	"${FILESDIR}/101_fix-buffer-overflow.diff"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-cppflags.patch"
-	"${FILESDIR}/${P}-bufsize.patch"
-	"${FILESDIR}/${P}-gcc47.patch"
-	"${FILESDIR}/${P}-constify.patch"
+	"${FILESDIR}"/1.5-amd64.patch
+	"${FILESDIR}"/101_fix-buffer-overflow.diff
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-cppflags.patch
+	"${FILESDIR}"/${P}-bufsize.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-constify.patch
 )
 
 src_prepare() {
-	# rename all configure.in files to prevent future
-	# autoconf breakage
-	local i
-	for i in "" "kkstrtext-0.1" "kkconsui-0.1"
-	do
-		mv ./${i}/configure.{in,ac} || die
-	done
-
 	default
-	cp "${S}"/{config.rpath,kkstrtext-0.1} || die
+
+	cp config.rpath kkstrtext-0.1/ || die
+
+	mv configure.{in,ac} || die
+	mv kkstrtext-0.1/configure.{in,ac} || die
+	mv kkconsui-0.1/configure.{in,ac} || die
 
 	eautoreconf
 }