summaryrefslogtreecommitdiff
path: root/app-cdr
diff options
context:
space:
mode:
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild4
-rw-r--r--app-cdr/bashburn/bashburn-3.1.0-r1.ebuild2
-rw-r--r--app-cdr/bchunk/bchunk-1.2.2.ebuild4
-rw-r--r--app-cdr/brasero/brasero-3.12.2-r1.ebuild5
-rw-r--r--app-cdr/burncdda/burncdda-1.8.3.ebuild4
-rw-r--r--app-cdr/cdrdao/cdrdao-1.2.4.ebuild4
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild4
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild4
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild4
-rw-r--r--app-cdr/cdw/cdw-0.8.1-r1.ebuild2
-rw-r--r--app-cdr/cdw/cdw-0.8.1.ebuild4
-rw-r--r--app-cdr/cdw/cdw-9999.ebuild2
-rw-r--r--app-cdr/cuecue/cuecue-0.2.2-r2.ebuild49
-rw-r--r--app-cdr/dolphin-plugins-mountiso/Manifest2
-rw-r--r--app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.1.ebuild (renamed from app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.0.ebuild)2
-rw-r--r--app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild4
-rw-r--r--app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild54
-rw-r--r--app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch24
-rw-r--r--app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild14
-rw-r--r--app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild4
-rw-r--r--app-cdr/isomaster/isomaster-1.3.13.ebuild2
-rw-r--r--app-cdr/mp3burn/mp3burn-0.4.2.ebuild4
-rw-r--r--app-cdr/multicd/multicd-1.7.5-r1.ebuild8
-rw-r--r--app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild4
-rw-r--r--app-cdr/xbiso/xbiso-0.6.1-r2.ebuild4
-rw-r--r--app-cdr/xbiso/xbiso-0.6.1-r3.ebuild4
26 files changed, 104 insertions, 118 deletions
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
index 3b1cee7804d0..2257660d9dfa 100644
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
PATCHES=( "${FILESDIR}/${P}-segfault.patch" )
S=${WORKDIR}/${PN}
diff --git a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
index cb728867031b..4a4d7811629b 100644
--- a/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
+++ b/app-cdr/bashburn/bashburn-3.1.0-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ppc ~ppc64 sparc x86"
BDEPEND="app-shells/bash"
RDEPEND="
+ app-cdr/cdrtools
app-shells/bash
app-cdr/cdrdao
app-cdr/dvd+rw-tools
@@ -25,7 +26,6 @@ RDEPEND="
|| ( media-sound/mpg123 media-sound/mpg321 )
media-sound/normalize
media-sound/vorbis-tools
- virtual/cdrtools
virtual/eject
"
diff --git a/app-cdr/bchunk/bchunk-1.2.2.ebuild b/app-cdr/bchunk/bchunk-1.2.2.ebuild
index 734b4a93272f..ce5fb4297727 100644
--- a/app-cdr/bchunk/bchunk-1.2.2.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
DOCS=( "${PN}.spec" README ChangeLog )
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
index 15af48340c06..917812f33104 100644
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -42,8 +42,9 @@ RDEPEND="${COMMON_DEPEND}
css? ( media-libs/libdvdcss:1.2 )
!libburn? (
app-cdr/cdrdao
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
- virtual/cdrtools )
+ )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${COMMON_DEPEND}
diff --git a/app-cdr/burncdda/burncdda-1.8.3.ebuild b/app-cdr/burncdda/burncdda-1.8.3.ebuild
index 066c9cbfdd08..aa7c508f6ba9 100644
--- a/app-cdr/burncdda/burncdda-1.8.3.ebuild
+++ b/app-cdr/burncdda/burncdda-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,10 +14,10 @@ IUSE="flac mp3 vorbis"
RDEPEND="
app-cdr/cdrdao
+ app-cdr/cdrtools
dev-util/dialog
media-sound/normalize
media-sound/sox
- virtual/cdrtools
flac? ( media-libs/flac )
mp3? (
media-sound/mpg123
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index 873494cf3c66..44047f7b0120 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,11 +16,11 @@ fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="encode mad vorbis"
COMMON_DEPEND="
- virtual/cdrtools
+ app-cdr/cdrtools
encode? ( >=media-sound/lame-3.99 )
mad? (
media-libs/libmad
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 0d3043b3c791..b86d95dc2ee5 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode selinux"
BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index d8e34044f0dc..38f39f61459a 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode selinux"
BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index b6c8ee6bdd56..bc2a268925bd 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode"
RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index a08d61f6d992..6195e6e940d0 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -13,11 +13,11 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-libs/libburn
dev-libs/libcdio:=[-minimal]
sys-libs/ncurses:0=[unicode]
- virtual/cdrtools
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
index a6fc76c6d470..2c1ad875af39 100644
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
RDEPEND="
- virtual/cdrtools
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-libs/libburn
dev-libs/libcdio[-minimal]
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 0a7a7b28f5fe..948a13742d92 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -15,11 +15,11 @@ LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-libs/libburn
dev-libs/libcdio:=[-minimal]
sys-libs/ncurses:0=[unicode]
- virtual/cdrtools
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
deleted file mode 100644
index a8418f36b021..000000000000
--- a/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Enable one use flag by default, bug 254745"
-IUSE="flac mp3 +vorbis"
-REQUIRED_USE="|| ( flac mp3 vorbis )"
-
-DEPEND="
- flac? ( media-libs/flac )
- mp3? ( media-libs/libmad )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-flac113.diff # bug 157706
- "${FILESDIR}"/${P}-namespace.patch
- "${FILESDIR}"/${P}-unused.patch
-)
-
-src_configure() {
- econf \
- $(use_enable flac) \
- $(use_enable mp3) \
- $(use_enable vorbis ogg) \
- --disable-libFLACtest \
- --disable-oggtest \
- --disable-vorbistest
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- default
-
- insinto /usr/include
- doins src/libcuecue/cuecue.h
-}
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 6dbf959ee8b7..ba853d934107 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,2 +1,2 @@
DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
-DIST dolphin-plugins-20.12.0.tar.xz 236436 BLAKE2B ed8b525c8934b3f1b41f53a9c22a1db211632b58a015e93d507eb46943920fc22e245b81e360bf30d75fe066a2a6ed36857bd3b446faf07b32132ef5755c1eb1 SHA512 a5ed5ae83ba8d2f0af5521f2219191acee2693aae656d829d425a8f9d7d21857511fdda3730dcc88e910ab5a2b6b76817a324498cffa390be3fa616bc57dd106
+DIST dolphin-plugins-20.12.1.tar.xz 238592 BLAKE2B 32b8e7e92e16b65f10255eff940496bd77fd544ba96e63db1a914ab97b3e9049cbec5c3136ddbc9d124c6d01e44b3d897e2e497ddd753c0c00960c17f503f91d SHA512 fbccd9d6e276d37e7874c4dcc31ea209e4e17bcac8feeb2ede386bb3ce8510428eba1e5fe58a1551fe81f61810454f177db61ce8607faa45a03509bafd303aad
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.0.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.1.ebuild
index 8382f72ba861..d19413eb48b5 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.0.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index 4facc0d56d39..0a8026d73789 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -10,10 +10,10 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="virtual/cdrtools"
+RDEPEND="app-cdr/cdrtools"
DEPEND="${RDEPEND}
sys-devel/m4"
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
index 37bf1ab8c15f..c0c0b03d50ac 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit desktop gnome2-utils toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs xdg
DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)"
HOMEPAGE="https://dvdisaster.net/"
-SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2"
+SRC_URI="http://dvdisaster.net/downloads/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
@@ -20,28 +21,36 @@ done
unset dvdi_lang
RDEPEND="
- >=dev-libs/glib-2.32:2
- nls? ( virtual/libintl )
- >=x11-libs/gtk+-2.6:2
+ dev-libs/glib:2
x11-libs/gdk-pixbuf
-"
-DEPEND="${RDEPEND}
+ x11-libs/gtk+:2
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
nls? ( sys-devel/gettext )
virtual/os-headers
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOCS=( CHANGELOG CREDITS.en README README.MODIFYING TODO TRANSLATION.HOWTO )
+
+src_prepare() {
+ default
+ sed -i -e "s@CC=gcc@CC=$(tc-getCC)@" scripts/bash-based-configure || die
+}
src_configure() {
./configure \
- --prefix=/usr \
- --bindir=/usr/bin \
- --mandir=/usr/share/man \
- --docdir=/usr/share/doc \
+ --prefix="${EPREFIX}"/usr \
+ --bindir="${EPREFIX}"/usr/bin \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --docdir="${EPREFIX}"/usr/share/doc \
--docsubdir=${PF} \
- --localedir=/usr/share/locale \
+ --localedir="${EPREFIX}"/usr/share/locale \
--buildroot="${D}" \
- --with-nls=$(usex nls) \
- --with-memdebug=$(usex debug) || die
+ --with-memdebug=$(usex debug) \
+ --with-nls=$(usex nls) || die
}
src_compile() {
@@ -49,7 +58,7 @@ src_compile() {
}
src_install() {
- DOCS="CHANGELOG CREDITS.en README* TODO *HOWTO" default
+ default
newicon contrib/${PN}48.png ${PN}.png
make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
@@ -59,7 +68,7 @@ src_install() {
newicon -s ${res} contrib/${PN}${res}.png ${PN}.png
done
- local dest="${D}"usr/share
+ local dest="${ED}"/usr/share
local dvdi_lang
for dvdi_lang in ${dvdi_langs}; do
@@ -69,8 +78,5 @@ src_install() {
${dest}/man/${dvdi_lang/-/_} || die
done
- rm -f "${D}"usr/bin/*-uninstall.sh || die
+ rm ${ED}/usr/bin/*-uninstall.sh || die
}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch b/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch
new file mode 100644
index 000000000000..c4c86138865e
--- /dev/null
+++ b/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch
@@ -0,0 +1,24 @@
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -425,9 +425,9 @@ typedef struct _CrcBlock
+ *** forward declarations
+ ***/
+
+-struct _RawBuffer *rawbuffer_forward;
+-struct _DefectiveSectorHeader *dsh_forward;
+-struct _DeviceHandle *dh_forward;
++extern struct _RawBuffer *rawbuffer_forward;
++extern struct _DefectiveSectorHeader *dsh_forward;
++extern struct _DeviceHandle *dh_forward;
+
+ /***
+ *** bitmap.c
+@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*);
+ *** build.h
+ ***/
+
+-int buildCount;
++extern int buildCount;
+
+ /***
+ *** cacheprobe.h
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index 6aa29472435f..c37e5d58fda6 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,14 +14,16 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="gtk"
-RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
+RDEPEND="
+ app-cdr/cdrtools
+ >=app-cdr/dvd+rw-tools-6.1
+ >=app-text/gocr-0.40
+ >=media-video/dvdauthor-0.6.11
>=media-video/mjpegtools-1.8.0-r1
>=media-video/subtitleripper-0.3.4-r1
- >=media-video/dvdauthor-0.6.11
- >=app-cdr/dvd+rw-tools-6.1
+ >=media-video/transcode-1.0.2-r2[dvd]
gtk? ( >=dev-perl/Gtk2-1.104 )
- >=app-text/gocr-0.40
- virtual/cdrtools"
+"
DEPEND=""
S=${WORKDIR}/${PN}
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
index f3b8ea315def..4b70f13298c6 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,10 +15,10 @@ IUSE="debug dvdr flac mp3 nls vorbis"
RDEPEND="
app-cdr/cdrdao
+ app-cdr/cdrtools
>=dev-libs/glib-2.4:2
>=gnome-base/libglade-2.4:2.0
media-libs/libmng:=
- virtual/cdrtools
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.4:2
dvdr? ( app-cdr/dvd+rw-tools )
diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
index a0b35f344ae5..ff5c9b5713d1 100644
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
index c391931b7233..8c1183cd0515 100644
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,10 +15,10 @@ IUSE=""
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
+ app-cdr/cdrtools
media-sound/mpg123
media-libs/flac
media-sound/vorbis-tools
- virtual/cdrtools
dev-perl/MP3-Info
dev-perl/Ogg-Vorbis-Header
dev-perl/String-ShellQuote
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
index 7e4550351a61..8f0d1c65328d 100644
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,8 +12,10 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
-RDEPEND=">=dev-lang/perl-5.8.6
- virtual/cdrtools"
+RDEPEND="
+ app-cdr/cdrtools
+ >=dev-lang/perl-5.8.6
+"
src_install() {
dobin multicd
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
index 7aefbe51e7b1..9b7f7ddcc134 100644
--- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,10 +15,10 @@ KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="
+ app-cdr/cdrtools
app-cdr/dvd+rw-tools
dev-lang/tcl:0
dev-lang/tk:0
- virtual/cdrtools
"
S=${WORKDIR}/tkdvd
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
index 276a3173003d..9340e06f7dce 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_prepare() {
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
index 46dc42820aef..5894d4c30c22 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_prepare() {