diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-sound/cdtool | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'media-sound/cdtool')
| -rw-r--r-- | media-sound/cdtool/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/cdtool/cdtool-2.1.8-r1.ebuild | 17 | ||||
| -rw-r--r-- | media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch | 40 |
3 files changed, 48 insertions, 12 deletions
diff --git a/media-sound/cdtool/Manifest b/media-sound/cdtool/Manifest index c06bf59dd52b..5923fee4849b 100644 --- a/media-sound/cdtool/Manifest +++ b/media-sound/cdtool/Manifest @@ -1,4 +1,5 @@ +AUX cdtool-2.1.8-fix-build-system.patch 1329 BLAKE2B 9f4d36b274e8184c1c7b2043010f0de5a3624ab6adc3c46bd96e0f5f155cd8ee4ed915103690a1a0e49df3c533967617ed2284a79e58fb8f3f369b711efa9425 SHA512 15415365506d0087243436adecb3eb8e42b91bebaf77477800f464ac53fefed90041e1f3d634f6b6a0d20036f29bef4d8ad5c3e589c4a1a9b8c38e098546dd96 AUX cdtool-2.1.8-glibc-2.10.patch 3511 BLAKE2B 09d13db78aee424fbdb06900a68ed17ee564ea249c0adc7814fea617e218884ed5651264e56cff9f1bf5ed0460318a9d038c11c36e36d5e45c5d8fa30d10696d SHA512 5b58d80d1cd28cbedeae89bc8452d3b047faf9eb61c3444b3b3fba5a709adf834b4451fac74cf8c48fe1b6e41c33683f427856ba1d9acc4ecbb5f0eb3b135326 DIST cdtool-2.1.8.tar.gz 116847 BLAKE2B 2c1be3cbbff91078fb398913105676e2ea46828a7739a0dd28bbbb0acfece23272a05015494ef54d7f235186f07a0bc77ff43077c937ac38f099304ec4e2b218 SHA512 9e4e65c753b0be024f0ceb04ec0fee52031992196e0e4a2b8dfef9dbc9feaa81462be61700c6d01f413941d66f7f3e374fb327e1bebcb79207c7b4c790cea006 -EBUILD cdtool-2.1.8-r1.ebuild 622 BLAKE2B ff489105f39aa58ff082c37be35cf70f7f3bf58f2d21393927fb30cf367328311be435751106cb55a049b8ae513f8ecf43b4a559ebe4265a808f141539ea7804 SHA512 f4717364d0fa3d09df1c9ef2135aea4da4e98e93b9007d5baee7fa60e194be8a25bfa4a3b6c190c575a476697e11b6a3ab81aa725fd910d88997e81e9ea67c31 +EBUILD cdtool-2.1.8-r1.ebuild 473 BLAKE2B fdf1a167a19f1dbd539f035590aaaf9a4e7ff5fe3c48ccf0345f675d78b556618f21b9dc4118fca404bd81e13e2ed691bcedb5c149984840f9134a37f851016e SHA512 1656bb070b7e5044c1bcd7adf21c34d69b92ffb8db8f4bef88b74db74417d473e8fdb2d74262c10bc88bcfdd70ececab892476ebfe3c7e517e2a7aae6818b3a0 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/cdtool/cdtool-2.1.8-r1.ebuild b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild index 6706ada72f63..0d81cefca180 100644 --- a/media-sound/cdtool/cdtool-2.1.8-r1.ebuild +++ b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" -inherit eutils +EAPI=7 DESCRIPTION="collection of command-line utilities to control cdrom devices" HOMEPAGE="http://hinterhof.net/cdtool/" @@ -15,11 +14,7 @@ IUSE="" RDEPEND="!media-sound/cdplay" -src_prepare() { - epatch "${FILESDIR}"/${P}-glibc-2.10.patch - sed -i \ - -e '/INSTALL/s:-o root::' \ - -e '/LINKTARGET/s:/lib/:/$(notdir $(libdir))/:' \ - -e '/^install-links:/s:$: install-files:' \ - Makefile.in || die -} +PATCHES=( + "${FILESDIR}"/${P}-glibc-2.10.patch + "${FILESDIR}"/${P}-fix-build-system.patch +) diff --git a/media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch b/media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch new file mode 100644 index 000000000000..c059a645112f --- /dev/null +++ b/media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch @@ -0,0 +1,40 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -44,11 +44,11 @@ + install: install-files install-links + install-files: + mkdir -p $(DESTDIR)$(bindir) +- $(INSTALL) cdctrl $(DESTDIR)$(bindir) -o root +- $(INSTALL) cdloop $(DESTDIR)$(bindir) -o root +- $(INSTALL) cdadd $(DESTDIR)$(bindir) -o root +- $(INSTALL) cdown $(DESTDIR)$(bindir) -o root +- $(INSTALL) cdtool2cddb $(DESTDIR)$(bindir) -o root ++ $(INSTALL) cdctrl $(DESTDIR)$(bindir) ++ $(INSTALL) cdloop $(DESTDIR)$(bindir) ++ $(INSTALL) cdadd $(DESTDIR)$(bindir) ++ $(INSTALL) cdown $(DESTDIR)$(bindir) ++ $(INSTALL) cdtool2cddb $(DESTDIR)$(bindir) + + mkdir -p $(DESTDIR)$(mandir)/man1 + $(INSTALL) cdctrl.1 $(DESTDIR)$(mandir)/man1 +@@ -59,9 +59,9 @@ + $(INSTALL) cdtool2cddb.1 $(DESTDIR)$(mandir)/man1 + + mkdir -p $(DESTDIR)$(libdir)/cdtool +- $(INSTALL) cdtool $(DESTDIR)$(libdir)/cdtool -o root ++ $(INSTALL) cdtool $(DESTDIR)$(libdir)/cdtool + +-LINKTARGET = ../lib/cdtool/cdtool ++LINKTARGET = ../$(notdir $(libdir))/cdtool/cdtool + LINKS = cdplay cdpause cdstop cdclose cdeject cdir cdinfo cdreset \ + cdvolume cdshuffle + +@@ -69,7 +69,7 @@ + install-links-local: bindir = . + install-links-local: install-links + +-install-links: ++install-links: install-files + for command in $(LINKS); do \ + if ! test -h $(DESTDIR)$(bindir)/$$command; then \ + echo installing $$command; \ |