commit: a1d42dfee326a5f0528ce563300018973487baa3 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Dec 12 16:02:53 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 12 16:02:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d42dfe
media-sound/jack-rack: Port to EAPI 7 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/jack-rack-1.4.7-disable_deprecated.patch | 8 +-- .../jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch | 12 +++++ .../files/jack-rack-1.4.8_rc1-underlinking.patch | 8 +-- media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild | 63 +++++++++++----------- 4 files changed, 51 insertions(+), 40 deletions(-) diff --git a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch index 1ddd318235e..fa5e1b646f7 100644 --- a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch +++ b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/376899 ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -53,13 +53,7 @@ $(XML_CFLAGS) \ -DPKGDATADIR=\"$(pkgdatadir)\" \ @@ -15,5 +15,5 @@ http://bugs.gentoo.org/376899 - + -DDTDDIR=\"$(dtddir)\" - jack_rack_LDFLAGS = \ - $(JACK_LIBS) \ + LIBS = \ + -ldl \ diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch new file mode 100644 index 00000000000..f5d845b6ffe --- /dev/null +++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch @@ -0,0 +1,12 @@ +--- a/jack-rack.desktop ++++ b/jack-rack.desktop +@@ -3,7 +3,7 @@ + Comment=Stereo LADSPA effects rack + Comment[ru]=Стойка эффектов LADSPA + Exec=jack-rack +-Icon=jack-rack-icon.png ++Icon=jack-rack-icon + Terminal=false + Type=Application +-Categories=GNOME;Application;AudioVideo; ++Categories=GNOME;GTK;AudioVideo; diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch index 5c96c01bde5..9948df4effb 100644 --- a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch +++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch @@ -1,10 +1,10 @@ This should be applied after Debian 02-gcc45_binutils_gold.patch which adds -ldl, but we need also -lm wrt http://bugs.gentoo.org/463696 for exp(), log() and logf() ---- src/Makefile.am -+++ src/Makefile.am -@@ -62,6 +62,7 @@ - +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -56,6 +56,7 @@ + -DDTDDIR=\"$(dtddir)\" LIBS = \ + -lm \ diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild index 7dc77e26f48..002b6ccc6f6 100644 --- a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild +++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit autotools eutils flag-o-matic toolchain-funcs +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs MY_P=${PN}_${PV/_/\~} DEB_URI="mirror://debian/pool/main/j/${PN}" @@ -16,40 +17,38 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="alsa gnome lash +xml" -RDEPEND=">=x11-libs/gtk+-2.12:2 - >=media-libs/ladspa-sdk-1.12 - media-sound/jack-audio-connection-kit - alsa? ( media-libs/alsa-lib ) - lash? ( >=media-sound/lash-0.5 ) - gnome? ( >=gnome-base/libgnomeui-2 ) +RDEPEND=" + media-libs/ladspa-sdk + virtual/jack virtual/libintl - xml? ( dev-libs/libxml2 - media-libs/liblrdf )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" + x11-libs/gtk+:2 + alsa? ( media-libs/alsa-lib:= ) + gnome? ( gnome-base/libgnomeui:= ) + lash? ( media-sound/lash:= ) + xml? ( + dev-libs/libxml2:= + media-libs/liblrdf:= + )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" -DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST ) +S="${WORKDIR}/${PN}-f9fb65d" -src_unpack() { - unpack ${A} - mv ${PN}-* "${S}" -} +PATCHES=( + "${WORKDIR}"/debian/patches/01-desktop_file.patch + "${WORKDIR}"/debian/patches/02-gcc45_binutils_gold.patch + "${WORKDIR}"/debian/patches/03-remove_midi_when_replacing_plugin.patch + "${FILESDIR}"/${PN}-1.4.6-noalsa.patch + "${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch + "${FILESDIR}"/${P}-noxml.patch + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-QA-fix-desktop-file.patch +) src_prepare() { - EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch "${WORKDIR}"/debian/patches - - epatch \ - "${FILESDIR}"/${PN}-1.4.6-noalsa.patch \ - "${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch \ - "${FILESDIR}"/${P}-noxml.patch \ - "${FILESDIR}"/${P}-underlinking.patch - - sed -i \ - -e '/Categories/s:Application:GTK:' \ - -e '/Icon/s:.png::' \ - ${PN}.desktop || die - + default eautopoint eautoreconf }
