| 1 |
commit: 8c0e7f880aeece8d1a2a1129910dc7a9fba6d521 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Dec 28 14:47:49 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 14:47:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c0e7f88 |
| 7 |
|
| 8 |
app-cdr/dvdisaster: Port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/709520 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild | 49 +++++++++++----------- |
| 16 |
.../files/dvdisaster-0.79.5-fno-common.patch | 24 +++++++++++ |
| 17 |
2 files changed, 49 insertions(+), 24 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild |
| 20 |
index 1cdfebed612..da320cf5b6a 100644 |
| 21 |
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild |
| 22 |
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild |
| 23 |
@@ -1,12 +1,13 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
-inherit desktop gnome2-utils toolchain-funcs |
| 30 |
+EAPI=7 |
| 31 |
+ |
| 32 |
+inherit desktop toolchain-funcs xdg |
| 33 |
|
| 34 |
DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)" |
| 35 |
HOMEPAGE="http://dvdisaster.net/" |
| 36 |
-SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2" |
| 37 |
+SRC_URI="http://dvdisaster.net/downloads/${P}.tar.bz2" |
| 38 |
|
| 39 |
LICENSE="GPL-3+" |
| 40 |
SLOT="0" |
| 41 |
@@ -20,28 +21,31 @@ done |
| 42 |
unset dvdi_lang |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
- >=dev-libs/glib-2.32:2 |
| 46 |
- nls? ( virtual/libintl ) |
| 47 |
- >=x11-libs/gtk+-2.6:2 |
| 48 |
+ dev-libs/glib:2 |
| 49 |
x11-libs/gdk-pixbuf |
| 50 |
-" |
| 51 |
-DEPEND="${RDEPEND} |
| 52 |
+ x11-libs/gtk+:2 |
| 53 |
+ nls? ( virtual/libintl )" |
| 54 |
+DEPEND="${RDEPEND}" |
| 55 |
+BDEPEND=" |
| 56 |
nls? ( sys-devel/gettext ) |
| 57 |
virtual/os-headers |
| 58 |
- virtual/pkgconfig |
| 59 |
-" |
| 60 |
+ virtual/pkgconfig" |
| 61 |
+ |
| 62 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 63 |
+ |
| 64 |
+DOCS=( CHANGELOG CREDITS.en README README.MODIFYING TODO TRANSLATION.HOWTO ) |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
./configure \ |
| 68 |
- --prefix=/usr \ |
| 69 |
- --bindir=/usr/bin \ |
| 70 |
- --mandir=/usr/share/man \ |
| 71 |
- --docdir=/usr/share/doc \ |
| 72 |
+ --prefix="${EPREFIX}"/usr \ |
| 73 |
+ --bindir="${EPREFIX}"/usr/bin \ |
| 74 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
| 75 |
+ --docdir="${EPREFIX}"/usr/share/doc \ |
| 76 |
--docsubdir=${PF} \ |
| 77 |
- --localedir=/usr/share/locale \ |
| 78 |
+ --localedir="${EPREFIX}"/usr/share/locale \ |
| 79 |
--buildroot="${D}" \ |
| 80 |
- --with-nls=$(usex nls) \ |
| 81 |
- --with-memdebug=$(usex debug) || die |
| 82 |
+ --with-memdebug=$(usex debug) \ |
| 83 |
+ --with-nls=$(usex nls) || die |
| 84 |
} |
| 85 |
|
| 86 |
src_compile() { |
| 87 |
@@ -49,7 +53,7 @@ src_compile() { |
| 88 |
} |
| 89 |
|
| 90 |
src_install() { |
| 91 |
- DOCS="CHANGELOG CREDITS.en README* TODO *HOWTO" default |
| 92 |
+ default |
| 93 |
|
| 94 |
newicon contrib/${PN}48.png ${PN}.png |
| 95 |
make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility' |
| 96 |
@@ -59,7 +63,7 @@ src_install() { |
| 97 |
newicon -s ${res} contrib/${PN}${res}.png ${PN}.png |
| 98 |
done |
| 99 |
|
| 100 |
- local dest="${D}"usr/share |
| 101 |
+ local dest="${ED}"/usr/share |
| 102 |
|
| 103 |
local dvdi_lang |
| 104 |
for dvdi_lang in ${dvdi_langs}; do |
| 105 |
@@ -69,8 +73,5 @@ src_install() { |
| 106 |
${dest}/man/${dvdi_lang/-/_} || die |
| 107 |
done |
| 108 |
|
| 109 |
- rm -f "${D}"usr/bin/*-uninstall.sh || die |
| 110 |
+ rm ${ED}/usr/bin/*-uninstall.sh || die |
| 111 |
} |
| 112 |
- |
| 113 |
-pkg_postinst() { gnome2_icon_cache_update; } |
| 114 |
-pkg_postrm() { gnome2_icon_cache_update; } |
| 115 |
|
| 116 |
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 |
| 117 |
new file mode 100644 |
| 118 |
index 00000000000..c4c86138865 |
| 119 |
--- /dev/null |
| 120 |
+++ b/app-cdr/dvdisaster/files/dvdisaster-0.79.5-fno-common.patch |
| 121 |
@@ -0,0 +1,24 @@ |
| 122 |
+--- a/dvdisaster.h |
| 123 |
++++ b/dvdisaster.h |
| 124 |
+@@ -425,9 +425,9 @@ typedef struct _CrcBlock |
| 125 |
+ *** forward declarations |
| 126 |
+ ***/ |
| 127 |
+ |
| 128 |
+-struct _RawBuffer *rawbuffer_forward; |
| 129 |
+-struct _DefectiveSectorHeader *dsh_forward; |
| 130 |
+-struct _DeviceHandle *dh_forward; |
| 131 |
++extern struct _RawBuffer *rawbuffer_forward; |
| 132 |
++extern struct _DefectiveSectorHeader *dsh_forward; |
| 133 |
++extern struct _DeviceHandle *dh_forward; |
| 134 |
+ |
| 135 |
+ /*** |
| 136 |
+ *** bitmap.c |
| 137 |
+@@ -450,7 +450,7 @@ void FreeBitmap(Bitmap*); |
| 138 |
+ *** build.h |
| 139 |
+ ***/ |
| 140 |
+ |
| 141 |
+-int buildCount; |
| 142 |
++extern int buildCount; |
| 143 |
+ |
| 144 |
+ /*** |
| 145 |
+ *** cacheprobe.h |
Archives