app-cdr/isomaster: Fix compilation (bug #399629)

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 89 insertions, 1 deletions

diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog
index 71ea71f58da8..de857358e681 100644
--- a/app-cdr/isomaster/ChangeLog
+++ b/app-cdr/isomaster/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/isomaster
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.20 2012/01/21 19:31:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.21 2012/01/21 20:40:38 sping Exp $
+
+*isomaster-1.3.9-r1 (21 Jan 2012)
+
+  21 Jan 2012; Sebastian Pipping <sping@gentoo.org> +isomaster-1.3.9-r1.ebuild,
+  +files/isomaster-1.3.9-iniparser-3.0.0.patch:
+  Fix compilation against iniparser 3.0.0 (bug #399629)
 
   21 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> isomaster-1.3.9.ebuild:
   Run fdo-mime_desktop_database_update from fdo-mime.eclass for the
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
new file mode 100644
index 000000000000..902028a660a2
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
@@ -0,0 +1,24 @@
+From d2cea534819267e9e8b7348b7cf6fdbad72c7b11 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+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.9-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..b669fa1dc466
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild,v 1.1 2012/01/21 20:40:38 sping Exp $
+
+EAPI=4
+inherit eutils fdo-mime toolchain-funcs
+
+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 ~x86-fbsd"
+IUSE="nls"
+
+#dev-libs/iniparser, see pkg_setup() and bug 399629
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+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() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-iniparser-3.0.0.patch  # bug 399629
+	rm -R iniparser-2.17 || die
+}
+
+src_configure() { :; } #274361
+
+src_compile() {
+	tc-export CC
+	emake "${myisoconf[@]}"
+}
+
+src_install() {
+	emake "${myisoconf[@]}" DESTDIR="${D}" install
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}