[gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/, app-cdr/isomaster/files/

2021-02-16 Thread Sebastian Pipping
commit: ecc56f5448f3ec78fe1d42ccdfe7f3a37bcc83a3
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Feb 16 17:25:33 2021 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Feb 16 17:32:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc56f54

app-cdr/isomaster: Drop old

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2

 app-cdr/isomaster/Manifest |  2 -
 .../files/isomaster-1.3.9-iniparser-3.0.0.patch| 24 ---
 app-cdr/isomaster/isomaster-1.3.13.ebuild  | 72 -
 app-cdr/isomaster/isomaster-1.3.14.ebuild  | 73 --
 4 files changed, 171 deletions(-)

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index fb6fa14901c..9cfadcdc022 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,3 +1 @@
-DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B 
ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c
 SHA512 
dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
-DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 
7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4
 SHA512 
5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
 DIST isomaster-1.3.15.tar.bz2 251622 BLAKE2B 
9a3dd4e4a0d6aa0ff5b76774322e2f66257dda18e01835cad911f7abaa83584de1388a6c21bed8a8c8b5b9e94d4a2f23801e656b2586cb24b38b5aa4ca074c15
 SHA512 
08d4b12ba1f35e8fdca75b05b3125b046a03e1f1dab6876226b45c76e8a40fa78296854e8142a0864402563913af4c935ffe338777b593026e40e121b4089661

diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch 
b/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
deleted file mode 100644
index 902028a660a..000
--- a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d2cea534819267e9e8b7348b7cf6fdbad72c7b11 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping 
-Date: Sat, 21 Jan 2012 21:34:33 +0100
-Subject: [PATCH] Fix compilation against iniparser 3.0.0 (bug #399629)
-

- Makefile |1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3f4b383..43187fc 100644
 a/Makefile
-+++ b/Makefile
-@@ -66,6 +66,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
- 
- ifdef USE_SYSTEM_INIPARSER
- CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
-+CPPFLAGS += -Diniparser_setstr=iniparser_set  # Define went away with 
iniparser 3.0.0, Gentoo bug #399629
- endif
- 
- OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o 
about.o settings.o boot.o editfile.o
--- 
-1.7.8.4
-

diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild 
b/app-cdr/isomaster/isomaster-1.3.13.ebuild
deleted file mode 100644
index 18d0da27808..000
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO 
images"
-HOMEPAGE="http://littlesvr.ca/isomaster;
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-3.0.0:0
-   x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
-)
-
-pkg_setup() {
-   myisoconf=(
-   DEFAULT_EDITOR=leafpad
-   MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-   USE_SYSTEM_INIPARSER=1
-   PREFIX=/usr
-   )
-
-   use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-   default
-   rm -f configure || die #274361
-   rm -R iniparser-2.17 || die
-}
-
-src_compile() {
-   tc-export CC
-   emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-   mv "${D}"/usr/share/locale{,_ALL} || die
-   dodir /usr/share/locale
-   for lingua in ${LINGUAS}; do
-   [[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-   mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-   done
-   rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-   emake "${myisoconf[@]}" DESTDIR="${D}" install
-   dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-   use nls && _apply_linguas  # bug 402679, bug 512448
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-}

diff --git 

[gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/, app-cdr/isomaster/files/

2020-01-27 Thread Sebastian Pipping
commit: 1904268464d4b62467b7ab754164b2f7784e031f
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Jan 27 22:37:33 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Jan 27 22:37:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19042684

app-cdr/isomaster: Fix compilation + EAPI 7

Closes: https://bugs.gentoo.org/706662
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 .../files/isomaster-1.3.14-include-path.patch  | 25 ++
 app-cdr/isomaster/isomaster-1.3.14.ebuild  |  8 +--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch 
b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
new file mode 100644
index 000..520a355e595
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
@@ -0,0 +1,25 @@
+From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Mon, 27 Jan 2020 23:33:49 +0100
+Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8f4f23b..124a035 100644
+--- a/Makefile
 b/Makefile
+@@ -65,7 +65,7 @@ CPPFLAGS +=  -DICONPATH=\"$(ICONPATH)\" 
-DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64
+ 
+ ifdef USE_SYSTEM_INIPARSER
+-CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
++CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) 
-I/usr/include/iniparser4
+ endif
+ 
+ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o 
about.o settings.o boot.o editfile.o
+-- 
+2.24.1
+

diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild 
b/app-cdr/isomaster/isomaster-1.3.14.ebuild
index c30620f0aa1..cbe941cb2b9 100644
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs xdg-utils
 
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
 
+PATCHES=(
+   "${FILESDIR}"/${P}-include-path.patch
+)
+
 pkg_setup() {
myisoconf=(
DEFAULT_EDITOR=leafpad