| 1 |
commit: f86d2a47c95c5f7a50ee1ebc0f8d92d9a0a89c8e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 17 22:37:50 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 17 22:37:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86d2a47 |
| 7 |
|
| 8 |
media-sound/timidity-eawpatches: Port to EAPI 7 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/697272 |
| 11 |
Package-Manager: Portage-2.3.77, Repoman-2.3.17 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/timidity-eawpatches-12-fix-dir.patch | 9 +++++ |
| 15 |
.../timidity-eawpatches-12-r5.ebuild | 39 ++++++++-------------- |
| 16 |
2 files changed, 23 insertions(+), 25 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-sound/timidity-eawpatches/files/timidity-eawpatches-12-fix-dir.patch b/media-sound/timidity-eawpatches/files/timidity-eawpatches-12-fix-dir.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..a41b0eac3d0 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/timidity-eawpatches/files/timidity-eawpatches-12-fix-dir.patch |
| 23 |
@@ -0,0 +1,9 @@ |
| 24 |
+--- a/linuxconfig/timidity.cfg |
| 25 |
++++ b/linuxconfig/timidity.cfg |
| 26 |
+@@ -1,5 +1,5 @@ |
| 27 |
+ #on my debian: /usr/local/share/timidity/timidity.cfg |
| 28 |
+-dir /home/user/eawpats/ |
| 29 |
++dir /usr/share/timidity/eawpatches |
| 30 |
+ source gravis.cfg |
| 31 |
+ source gsdrums.cfg |
| 32 |
+ source gssfx.cfg |
| 33 |
|
| 34 |
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild |
| 35 |
index 942dcdb38ee..3c9b2827791 100644 |
| 36 |
--- a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild |
| 37 |
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild |
| 38 |
@@ -1,9 +1,7 @@ |
| 39 |
-# Copyright 1999-2018 Gentoo Foundation |
| 40 |
+# Copyright 1999-2019 Gentoo Authors |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
-EAPI=0 |
| 44 |
- |
| 45 |
-S=${WORKDIR}/eawpats |
| 46 |
+EAPI=7 |
| 47 |
|
| 48 |
DESCRIPTION="Eric Welsh's GUS patches for TiMidity" |
| 49 |
HOMEPAGE="http://www.stardate.bc.ca/eawpatches/html/default.htm" |
| 50 |
@@ -12,41 +10,32 @@ SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz" |
| 51 |
LICENSE="free-noncomm" |
| 52 |
SLOT="0" |
| 53 |
KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86" |
| 54 |
-IUSE="" |
| 55 |
+RESTRICT="binchecks strip" |
| 56 |
|
| 57 |
# These can be used for libmodplug too, so don't depend on timidity++ |
| 58 |
DEPEND="app-eselect/eselect-timidity" |
| 59 |
RDEPEND="" |
| 60 |
|
| 61 |
-RESTRICT="binchecks strip" |
| 62 |
+S="${WORKDIR}/eawpats" |
| 63 |
|
| 64 |
-src_unpack() { |
| 65 |
- unpack ${A} |
| 66 |
- sed -i -e "s:dir /home/user/eawpats/:dir /usr/share/timidity/eawpatches:" "${S}/linuxconfig/timidity.cfg" |
| 67 |
-} |
| 68 |
+PATCHES=( "${FILESDIR}"/${P}-fix-dir.patch ) |
| 69 |
|
| 70 |
src_install() { |
| 71 |
- local instdir=/usr/share/timidity |
| 72 |
+ # Install documentation, including subdirs |
| 73 |
+ local f |
| 74 |
+ while IFS="" read -d $'\0' -r f; do |
| 75 |
+ dodoc "${f}" |
| 76 |
+ rm "${f}" || die |
| 77 |
+ done < <(find . -type f -name '*.txt' -print0) |
| 78 |
|
| 79 |
# Set our installation directory |
| 80 |
- insinto ${instdir}/eawpatches |
| 81 |
+ insinto /usr/share/timidity/eawpatches |
| 82 |
|
| 83 |
# Install base timidity configuration for timidity-update |
| 84 |
doins linuxconfig/timidity.cfg |
| 85 |
- rm -rf linuxconfig/ winconfig/ |
| 86 |
- |
| 87 |
- # Install base eawpatches |
| 88 |
- doins *.cfg *.pat |
| 89 |
- rm *.cfg *.pat |
| 90 |
+ rm -rf linuxconfig/ winconfig/ patref24.hlp ultrasnd.ini || die |
| 91 |
|
| 92 |
- # Install patches from subdirectories |
| 93 |
- for d in `find . -type f -name \*.pat | sed 's,/[^/]*$,,' | sort -u`; do |
| 94 |
- insinto ${instdir}/eawpatches/${d} |
| 95 |
- doins ${d}/*.pat |
| 96 |
- done |
| 97 |
- |
| 98 |
- # Install documentation, including subdirs |
| 99 |
- dodoc $(find . -name \*.txt) |
| 100 |
+ doins -r . |
| 101 |
} |
| 102 |
|
| 103 |
pkg_postinst() { |
Archives