media-sound/splay: Patch out completely broken Qt3 handling

Gentoo-Bug: 574202
* Add missing media-libs/id3lib dependency
* Remove xsplay.1 man page

Package-Manager: portage-2.2.27

diff --git a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
similarity index 85%
rename from media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
rename to media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
index 286228af449f54b6a6bb9c86d3a86c1c69a045eb..52cea88b89ed55bb08c0569171e8192032efbe8e 100644 (file)
--- a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
@@ -1,3 +1,35 @@
+* Remove completely broken Qt handling, dating back to Qt3 days
+* Fix ancient C++ includes using '.h' suffixes
+* Fix warnings caused by not using 'const char*'
+
+--- splay-0.9.5.2/apps/Makefile.am
++++ splay-0.9.5.2/apps/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS = splay @XSPLAY@
++bin_PROGRAMS = splay
+ EXTRA_PROGRAMS =xsplay
+ splay_SOURCES =  common.cc splay.cc splay.h
+ xsplay_SOURCES = xsplay.cc functions.cc \
+@@ -17,7 +17,7 @@
+ INCLUDES = -I../libs  -I/usr/include/qt
+ xsplay_LDADD=-lqt $(LDADD)
+ 
+-man_MANS = splay.1 xsplay.1
++man_MANS = splay.1
+ EXTRA_DIST = $(man_MANS)
+ 
+ 
+--- splay-0.9.5.2/configure.ac
++++ splay-0.9.5.2/configure.ac
+@@ -15,7 +15,7 @@
+ AC_CHECK_LIB(id3, ID3Tag_New)
+ AC_CHECK_LIB(m, cos)
+ AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
+-AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
++
+ 
+ if test "$INCLUDEPTHREAD" = 1; then
+       LIBS="$LIBS -lpthread"
 --- splay-0.9.5.2/apps/common.cc
 +++ splay-0.9.5.2/apps/common.cc
 @@ -34,7 +34,7 @@

diff --git a/media-sound/splay/splay-0.9.5.2-r1.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild
similarity index 85%
rename from media-sound/splay/splay-0.9.5.2-r1.ebuild
rename to media-sound/splay/splay-0.9.5.2-r2.ebuild
index 71131061777990c9d19d9d463ca7c266e167519f..67d31aeeacb9c2d9d864f5c107eabbfbbe74373a 100644 (file)
--- a/media-sound/splay/splay-0.9.5.2-r1.ebuild
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -15,10 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+DEPEND="media-libs/id3lib"
+RDEPEND="${DEPEND}"
+
 PATCHES=(
        "${FILESDIR}/${P}-external-id3lib.diff"
        "${FILESDIR}/${P}-gcc43-2.patch"
-       "${FILESDIR}/${P}-modernize-cpp.patch"
+       "${FILESDIR}/${P}-fix-buildsystem.patch"
 )
 
 src_prepare() {