Fix compatibility with EAPI 6 and Gentoo 17.0 profiles (#17)

* Fix compatibility with EAPI 6 and Gentoo 17.0 profile * Migrate to a new CMake flags syntax * Add -p0 to fix patches applying * Fix deadbeef-archive-reader compiling * Fix compilation of 9999 packages
damex · Dec 12, 2017 · f74c594 · f74c594
1 parent 9029d3e
commit f74c594
Show file tree

Hide file tree

Showing 38 changed files with 141 additions and 93 deletions.
diff --git a/...r/deadbeef-archive-reader-20140219.ebuild → ...eadbeef-archive-reader-20140219-r1.ebuild b/...r/deadbeef-archive-reader-20140219.ebuild → ...eadbeef-archive-reader-20140219-r1.ebuild
@@ -13,6 +13,8 @@ ESVN_REVISION="16"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-flags.patch"
-}
+PATCHES=(
+	-p0
+	"${FILESDIR}/${PN}-flags.patch"
+	"${FILESDIR}/fix-blargg_ok-declaration.patch"
+)
diff --git a/media-plugins/deadbeef-archive-reader/deadbeef-archive-reader-99999999.ebuild b/media-plugins/deadbeef-archive-reader/deadbeef-archive-reader-99999999.ebuild
@@ -12,6 +12,8 @@ ESVN_REPO_URI="https://subversion.assembla.com/svn/deadbeef_vfs_archive_reader/t
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-flags.patch"
-}
+PATCHES=(
+	-p0
+	"${FILESDIR}/${PN}-flags.patch"
+	"${FILESDIR}/fix-blargg_ok-declaration.patch"
+)
diff --git a/media-plugins/deadbeef-archive-reader/files/fix-blargg_ok-declaration.patch b/media-plugins/deadbeef-archive-reader/files/fix-blargg_ok-declaration.patch
@@ -0,0 +1,12 @@
+diff -ur fex/fex/blargg_common.h fex/fex/blargg_common.h
+--- fex/fex/blargg_common.h	2017-12-11 04:23:06.117064206 +0200
++++ fex/fex/blargg_common.h	2017-12-11 04:24:33.193846532 +0200
+@@ -12,7 +12,7 @@
+ typedef const char* blargg_err_t; // 0 on success, otherwise error string
+
+ // Success; no error
+-int const blargg_ok = 0;
++static const char* blargg_ok = 0;
+
+ // BLARGG_RESTRICT: equivalent to C99's restrict, where supported
+ #if __GNUC__ >= 3 || _MSC_VER >= 1100
diff --git a/...adbeef-bs2b/deadbeef-bs2b-20110319.ebuild → ...eef-bs2b/deadbeef-bs2b-20110319-r1.ebuild b/...adbeef-bs2b/deadbeef-bs2b-20110319.ebuild → ...eef-bs2b/deadbeef-bs2b-20110319-r1.ebuild
@@ -20,6 +20,4 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/bs2b-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}.patch" )
diff --git a/media-plugins/deadbeef-bs2b/deadbeef-bs2b-99999999.ebuild b/media-plugins/deadbeef-bs2b/deadbeef-bs2b-99999999.ebuild
@@ -16,6 +16,4 @@ RDEPEND+=" media-libs/libbs2b:0"
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}.patch" )
diff --git a/...beef-fb/deadbeef-fb-0.87_p20160106.ebuild → ...f-fb/deadbeef-fb-0.87_p20160106-r1.ebuild b/...beef-fb/deadbeef-fb-0.87_p20160106.ebuild → ...f-fb/deadbeef-fb-0.87_p20160106-r1.ebuild
@@ -24,9 +24,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/deadbeef-fb-${PV/*_p/}-${GITLAB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-avoid-version.patch"
+PATCHES=( "${FILESDIR}/${PN}-avoid-version.patch" )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/...beef-fb/deadbeef-fb-0.92_p20160216.ebuild → ...f-fb/deadbeef-fb-0.92_p20160216-r1.ebuild b/...beef-fb/deadbeef-fb-0.92_p20160216.ebuild → ...f-fb/deadbeef-fb-0.92_p20160216-r1.ebuild
@@ -24,9 +24,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/deadbeef-fb-${PV/*_p/}-${GITLAB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-avoid-version.patch"
+PATCHES=( -p0 "${FILESDIR}/${PN}-avoid-version.patch" )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-fb/deadbeef-fb-99999999.ebuild b/media-plugins/deadbeef-fb/deadbeef-fb-99999999.ebuild
@@ -22,9 +22,10 @@ RDEPEND+=" !media-plugins/deadbeef-librarybrowser:0"
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-avoid-version.patch"
+PATCHES=( -p0 "${FILESDIR}/${PN}-avoid-version-${PV}.patch" )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-fb/files/deadbeef-fb-avoid-version-99999999.patch b/media-plugins/deadbeef-fb/files/deadbeef-fb-avoid-version-99999999.patch
@@ -0,0 +1,18 @@
+--- Makefile.am.orig	2017-12-11 05:18:17.319419283 +0200
++++ Makefile.am	2017-12-11 05:16:37.384425387 +0200
+@@ -46,13 +46,13 @@
+
+ if HAVE_GTK2
+ ddb_misc_filebrowser_GTK2_la_SOURCES = $(filebrowser_SOURCES)
+-ddb_misc_filebrowser_GTK2_la_LDFLAGS = -module
++ddb_misc_filebrowser_GTK2_la_LDFLAGS = -module -avoid-version
+ ddb_misc_filebrowser_GTK2_la_LIBADD  = $(LDADD) $(GTK2_DEPS_LIBS)
+ ddb_misc_filebrowser_GTK2_la_CFLAGS  = -pipe -std=c99 $(GTK2_DEPS_CFLAGS) $(EXTRA_FLAGS) $(VERSION_FLAGS)
+ endif
+ if HAVE_GTK3
+ ddb_misc_filebrowser_GTK3_la_SOURCES = $(filebrowser_SOURCES)
+-ddb_misc_filebrowser_GTK3_la_LDFLAGS = -module
++ddb_misc_filebrowser_GTK3_la_LDFLAGS = -module -avoid-version
+ ddb_misc_filebrowser_GTK3_la_LIBADD  = $(LDADD) $(GTK3_DEPS_LIBS)
+ ddb_misc_filebrowser_GTK3_la_CFLAGS  = -pipe -std=c99 $(GTK3_DEPS_CFLAGS) $(EXTRA_FLAGS) $(VERSION_FLAGS)
+ endif
diff --git a/...eys/deadbeef-gnome-mmkeys-20131012.ebuild → .../deadbeef-gnome-mmkeys-20131012-r1.ebuild b/...eys/deadbeef-gnome-mmkeys-20131012.ebuild → .../deadbeef-gnome-mmkeys-20131012-r1.ebuild
@@ -18,6 +18,4 @@ RDEPEND+=" sys-apps/dbus:0"
 
 S="${WORKDIR}/${PN}-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}.patch" )
diff --git a/media-plugins/deadbeef-gnome-mmkeys/deadbeef-gnome-mmkeys-99999999.ebuild b/media-plugins/deadbeef-gnome-mmkeys/deadbeef-gnome-mmkeys-99999999.ebuild
@@ -16,6 +16,4 @@ KEYWORDS=""
 
 RDEPEND+=" sys-apps/dbus:0"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}.patch"
-}
+PATCHES=( -F3 "${FILESDIR}/${PN}.patch" )
diff --git a/...dbeef-infobar/deadbeef-infobar-1.4.ebuild → ...ef-infobar/deadbeef-infobar-1.4-r1.ebuild b/...dbeef-infobar/deadbeef-infobar-1.4.ebuild → ...ef-infobar/deadbeef-infobar-1.4-r1.ebuild
@@ -20,10 +20,13 @@ RDEPEND+=" dev-libs/libxml2:2
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.diff"
-	eapply "${FILESDIR}/${PN}-load-gtk2-and-gtk3-version-fix.diff"
+PATCHES=(
+	"${FILESDIR}/${PN}-cflags.diff"
+	"${FILESDIR}/${PN}-load-gtk2-and-gtk3-version-fix.diff"
+)
 
+src_prepare() {
+	default
 	use gtk2 && eapply "${FILESDIR}/${PN}-focus-fix.diff"
 }
 

diff --git a/media-plugins/deadbeef-infobar/deadbeef-infobar-9999.ebuild b/media-plugins/deadbeef-infobar/deadbeef-infobar-9999.ebuild
@@ -20,10 +20,13 @@ RDEPEND+=" dev-libs/libxml2:2
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.diff"
-	eapply "${FILESDIR}/${PN}-load-gtk2-and-gtk3-version-fix.diff"
+PATCHES=(
+	"${FILESDIR}/${PN}-cflags.diff"
+	"${FILESDIR}/${PN}-load-gtk2-and-gtk3-version-fix.diff"
+)
 
+src_prepare() {
+	default
 	use gtk2 && eapply "${FILESDIR}/${PN}-focus-fix.diff"
 }
 

diff --git a/...adbeef-jack/deadbeef-jack-20110321.ebuild → ...eef-jack/deadbeef-jack-20110321-r1.ebuild b/...adbeef-jack/deadbeef-jack-20110321.ebuild → ...eef-jack/deadbeef-jack-20110321-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/jack-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-api.patch"
-	eapply "${FILESDIR}/${PN}-build.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-api.patch"
+	"${FILESDIR}/${PN}-build.patch"
+)
diff --git a/media-plugins/deadbeef-jack/deadbeef-jack-99999999.ebuild b/media-plugins/deadbeef-jack/deadbeef-jack-99999999.ebuild
@@ -16,7 +16,7 @@ RDEPEND+=" virtual/jack:0"
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-api.patch"
-	eapply "${FILESDIR}/${PN}-build.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-api.patch"
+	"${FILESDIR}/${PN}-build.patch"
+)
diff --git a/...r/deadbeef-librarybrowser-20141201.ebuild → ...eadbeef-librarybrowser-20141201-r1.ebuild b/...r/deadbeef-librarybrowser-20141201.ebuild → ...eadbeef-librarybrowser-20141201-r1.ebuild
@@ -22,9 +22,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-avoid-version.patch"
+PATCHES=( -p0 "${FILESDIR}/${PN}-avoid-version.patch" )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-librarybrowser/deadbeef-librarybrowser-99999999.ebuild b/media-plugins/deadbeef-librarybrowser/deadbeef-librarybrowser-99999999.ebuild
@@ -18,9 +18,10 @@ RDEPEND+=" !media-plugins/deadbeef-fb:0"
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-avoid-version.patch"
+PATCHES=( -p0 "${FILESDIR}/${PN}-avoid-version.patch" )
 
+src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-mpris/deadbeef-mpris-1.10.ebuild b/media-plugins/deadbeef-mpris/deadbeef-mpris-1.10.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 S="${WORKDIR}/${P/-mpris/}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-mpris/deadbeef-mpris-1.8.ebuild b/media-plugins/deadbeef-mpris/deadbeef-mpris-1.8.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 S="${WORKDIR}/${P/-mpris/}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-mpris/deadbeef-mpris-1.9.ebuild b/media-plugins/deadbeef-mpris/deadbeef-mpris-1.9.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 S="${WORKDIR}/${P/-mpris/}"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/media-plugins/deadbeef-mpris/deadbeef-mpris-99999999.ebuild b/media-plugins/deadbeef-mpris/deadbeef-mpris-99999999.ebuild
@@ -14,6 +14,7 @@ KEYWORDS=""
 IUSE=""
 
 src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/...deadbeef-musical-spectrum-20151013.ebuild → ...dbeef-musical-spectrum-20151013-r1.ebuild b/...deadbeef-musical-spectrum-20151013.ebuild → ...dbeef-musical-spectrum-20151013-r1.ebuild
@@ -22,9 +22,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/ddb_musical_spectrum-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}-cflags.patch" )
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/...deadbeef-musical-spectrum-20160426.ebuild → ...dbeef-musical-spectrum-20160426-r1.ebuild b/...deadbeef-musical-spectrum-20160426.ebuild → ...dbeef-musical-spectrum-20160426-r1.ebuild
@@ -22,9 +22,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/ddb_musical_spectrum-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}-cflags.patch" )
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/media-plugins/deadbeef-musical-spectrum/deadbeef-musical-spectrum-99999999.ebuild b/media-plugins/deadbeef-musical-spectrum/deadbeef-musical-spectrum-99999999.ebuild
@@ -18,9 +18,9 @@ RDEPEND+=" sci-libs/fftw:3.0="
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-cflags.patch"
+)
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/...adbeef-replaygain-control-20140802.ebuild → ...eef-replaygain-control-20140802-r1.ebuild b/...adbeef-replaygain-control-20140802.ebuild → ...eef-replaygain-control-20140802-r1.ebuild
@@ -18,9 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/ddb_replaygain_control-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}-cflags.patch" )
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/media-plugins/deadbeef-replaygain-control/deadbeef-replaygain-control-99999999.ebuild b/media-plugins/deadbeef-replaygain-control/deadbeef-replaygain-control-99999999.ebuild
@@ -14,9 +14,9 @@ EGIT_REPO_URI="https://github.com/cboxdoerfer/ddb_replaygain_control.git"
 LICENSE="GPL-2"
 KEYWORDS=""
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-cflags.patch"
+)
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/media-plugins/deadbeef-soxr/deadbeef-soxr-99999999.ebuild b/media-plugins/deadbeef-soxr/deadbeef-soxr-99999999.ebuild
@@ -7,7 +7,7 @@ inherit deadbeef-plugins git-r3
 
 DESCRIPTION="DeaDBeeF sox resampler plugin"
 HOMEPAGE="https://github.com/silentlexx/deadbeef_soxr"
-EGIT_REPO_URI="https://gitorious.org/silentlexx/deadbeef_soxr.git"
+EGIT_REPO_URI="https://github.com/silentlexx/deadbeef_soxr.git"
 
 LICENSE="GPL-2"
 KEYWORDS=""

diff --git a/...gram/deadbeef-spectrogram-20150110.ebuild → ...m/deadbeef-spectrogram-20150110-r1.ebuild b/...gram/deadbeef-spectrogram-20150110.ebuild → ...m/deadbeef-spectrogram-20150110-r1.ebuild
@@ -22,9 +22,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/ddb_spectrogram-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}-cflags.patch" )
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/media-plugins/deadbeef-spectrogram/deadbeef-spectrogram-99999999.ebuild b/media-plugins/deadbeef-spectrogram/deadbeef-spectrogram-99999999.ebuild
@@ -18,9 +18,9 @@ RDEPEND+=" sci-libs/fftw:3.0="
 
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-cflags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-cflags.patch"
+)
 
 src_compile() {
 	use gtk2 && emake gtk2

diff --git a/...tifier/deadbeef-statusnotifier-1.2.ebuild → ...ier/deadbeef-statusnotifier-1.2-r1.ebuild b/...tifier/deadbeef-statusnotifier-1.2.ebuild → ...ier/deadbeef-statusnotifier-1.2-r1.ebuild
@@ -21,9 +21,10 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/deadbeef-statusnotifier-plugin-${PV}"
 
 src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_use gtk2 GTK2)
-		$(cmake-utils_use_use gtk3 GTK3)"
+	local mycmakeargs=(
+		-DUSE_GTK2="$(usex gtk2)"
+		-DUSE_GTK3="$(usex gtk3)"
+	)
 	cmake-utils_src_configure
 }
 

diff --git a/media-plugins/deadbeef-statusnotifier/deadbeef-statusnotifier-9999.ebuild b/media-plugins/deadbeef-statusnotifier/deadbeef-statusnotifier-9999.ebuild
@@ -19,9 +19,10 @@ RDEPEND+=" dev-libs/libdbusmenu:0"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_use gtk2 GTK2)
-		$(cmake-utils_use_use gtk3 GTK3)"
+	local mycmakeargs=(
+		-DUSE_GTK2="$(usex gtk2)"
+		-DUSE_GTK3="$(usex gtk3)"
+	)
 	cmake-utils_src_configure
 }
 

diff --git a/...r/deadbeef-stereo-widener-20110319.ebuild → ...eadbeef-stereo-widener-20110319-r1.ebuild b/...r/deadbeef-stereo-widener-20110319.ebuild → ...eadbeef-stereo-widener-20110319-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/stereo-widener-${GITHUB_COMMIT}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-api.patch"
-	eapply "${FILESDIR}/${PN}-build.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-api.patch"
+	"${FILESDIR}/${PN}-build.patch"
+)
diff --git a/media-plugins/deadbeef-stereo-widener/deadbeef-stereo-widener-99999999.ebuild b/media-plugins/deadbeef-stereo-widener/deadbeef-stereo-widener-99999999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://gitorious.org/deadbeef-sm-plugins/stereo-widener.git"
 LICENSE="MIT"
 KEYWORDS=""
 
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-api.patch"
-	eapply "${FILESDIR}/${PN}-build.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-api.patch"
+	"${FILESDIR}/${PN}-build.patch"
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ IUSE="" @@
     S="${WORKDIR}/${P/-mpris/}"
     src_prepare() {
+    	default
     	eautoreconf
     }
@@ Expand Down @@