public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/files/, app-cdr/isomaster/
@ 2018-03-05 15:19 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-03-05 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     46892b854491ec05fc14002c6001d0da6ca0fabb
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 15:14:39 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 15:14:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46892b85

app-cdr/isomaster: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-cdr/isomaster/Manifest                         |  3 -
 .../files/isomaster-1.3.11-make-install.patch      | 34 -----------
 .../isomaster/files/isomaster-1.3.5-ldflags.diff   | 11 ----
 .../isomaster/files/isomaster-1.3.9-asneeded.patch | 14 -----
 app-cdr/isomaster/isomaster-1.3.11.ebuild          | 69 ----------------------
 app-cdr/isomaster/isomaster-1.3.5.ebuild           | 34 -----------
 app-cdr/isomaster/isomaster-1.3.9-r1.ebuild        | 69 ----------------------
 7 files changed, 234 deletions(-)

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index bfd26804d1a..bab4c8e2e8a 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,4 +1 @@
-DIST isomaster-1.3.11.tar.bz2 232153 BLAKE2B e97c6a11a642d010c2c79ccd2e7a18cf71ebc73a80bc5c3cf065d47614a62de6e3613c44f085fec67a2556f36303bf861169e9499d0ec186e853a690020c5aae SHA512 98c654c9320410765f5d7656396b3d87c34505410638c01e3ae65b89a20eb19d6554a70c3deca79e39524459e3cce618be3e42fdce8b5de1d88fa72fa6e122d9
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
-DIST isomaster-1.3.5.tar.bz2 196042 BLAKE2B ca7d90bbb7afca7e653af2269644f92559fd827db72852fa82ab6e948000784b925a374aaeda9b9ed048ab13f6e5180321194629b83231f840c9226d9edc46ff SHA512 25ef3a8e4a381100ea8c1aa913f7ec28dc8b7c2c0f8bfa1cdcda529d69a76b7d8baf35ca3dfa087b7210f3ad53f340259717c099c188386b511e641a358aac93
-DIST isomaster-1.3.9.tar.bz2 223514 BLAKE2B 7d3f0b2b26dfa0db2f9fbadc81d44d0b9bd687cfb346d4f7fb20861da17a4dc916bf85b7062429f564dad6bf12ad9dcad6e4b606afc2b5f775d35373d2fa26ed SHA512 746f8e67fc5ebf39caaf1900c55752c07761cf919f49b49fdbf449b0c1309445c01b38d57cd5b741c057dd8d020d941863d2b29c1d5a725078cf8448d3ff8a4b

diff --git a/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch b/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch
deleted file mode 100644
index 90ebe346a0c..00000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5717fb2da383d0c8c80fffdbe3ced568b2151f86 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 29 May 2014 18:58:48 +0200
-Subject: [PATCH] Fix "make install"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[..]
-for FILE in bkisofs-manual/manual/*html; do \
-            install -m 644 $FILE DESTDIR/usr/share/doc/isomaster-1.3.11/bkisofs; \
-        done;
-install: cannot create regular file ‘DESTDIR/usr/share/doc/isomaster-1.3.11/bkisofs’: No such file or directory
-[..]
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 116b2fd..fa4989e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -129,7 +129,7 @@ endif
- 	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
- 	$(INSTALL) -d $(DESTDIR)$(DESKTOPPATH)
- 	$(INSTALL) -m 644 isomaster.desktop $(DESTDIR)$(DESKTOPPATH)
--	#$(INSTALL) -d $(DESTDIR)$(MYDOCPATH)
-+	$(INSTALL) -d $(DESTDIR)$(MYDOCPATH)
- 	for FILE in bkisofs-manual/manual/*html; do \
-             $(INSTALL) -m 644 $$FILE $(DESTDIR)$(MYDOCPATH); \
-         done;
--- 
-1.9.3
-

diff --git a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff b/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
deleted file mode 100644
index 8f328912552..00000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -64,7 +64,7 @@
- 
- isomaster: $(OBJECTS) lib iniparser
- 	@echo 'Linking isomaster'
--	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
-+	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
- 
- # static pattern rule
- $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile

diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch b/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
deleted file mode 100644
index 102f54db4a1..00000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -75,9 +75,9 @@
- isomaster: $(OBJECTS) lib iniparser
- 	@echo 'Linking isomaster'
- ifndef USE_SYSTEM_INIPARSER
--	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a iniparser-2.17/libiniparser.a `pkg-config --libs gtk+-2.0` 
- else
--	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a -liniparser `pkg-config --libs gtk+-2.0`
- endif
- 
- # static pattern rule

diff --git a/app-cdr/isomaster/isomaster-1.3.11.ebuild b/app-cdr/isomaster/isomaster-1.3.11.ebuild
deleted file mode 100644
index 2a7e5876f9f..00000000000
--- a/app-cdr/isomaster/isomaster-1.3.11.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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
-
-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}-make-install.patch
-	epatch "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
-	rm -R iniparser-2.17 || die
-}
-
-src_configure() { :; } #274361
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
-	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() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/app-cdr/isomaster/isomaster-1.3.5.ebuild b/app-cdr/isomaster/isomaster-1.3.5.ebuild
deleted file mode 100644
index c3da00580be..00000000000
--- a/app-cdr/isomaster/isomaster-1.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils 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=""
-
-RDEPEND=">=x11-libs/gtk+-2:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.diff
-}
-
-src_configure() { :; }
-
-src_compile() {
-	tc-export CC
-	emake PREFIX="/usr" || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT
-}

diff --git a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
deleted file mode 100644
index 7f6726773d3..00000000000
--- a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-RDEPEND=">=dev-libs/iniparser-3.0.0:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/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 #399629
-	rm -R iniparser-2.17 || die
-}
-
-src_configure() { :; } #274361
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
-	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
-
-	_apply_linguas  # bug 402679
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/files/, app-cdr/isomaster/
@ 2021-02-06 18:49 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2021-02-06 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     c9b663c6de96b2d326bdfe9afdbe04c7954806a0
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 18:45:26 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 18:48:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b663c6

app-cdr/isomaster: Respect variable AR

Closes: https://bugs.gentoo.org/740138
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2

 app-cdr/isomaster/files/isomaster-1.3.15-ar.patch | 25 +++++++++++++++++++++++
 app-cdr/isomaster/isomaster-1.3.15.ebuild         |  5 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch
new file mode 100644
index 00000000000..12c5ef4c362
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch
@@ -0,0 +1,25 @@
+From 1553ea30148f69bce545b3a79ab3f7847566c50a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Feb 2021 19:36:33 +0100
+Subject: [PATCH] Makefile: Give external AR="$(tc-getAR)" a chance to win
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f005099..98808f8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ OPTFLAGS ?= -Wall
+ 
+ # programs used in the Makefiles:
+ export CC      ?= gcc
+-export AR      = ar
++export AR      ?= ar
+ export RM      = rm -f
+ export INSTALL = install
+ export CP      = cp
+-- 
+2.30.0
+

diff --git a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild
index 4409476a71a..f9907cc82e0 100644
--- a/app-cdr/isomaster/isomaster-1.3.15.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.15.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
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
+	"${FILESDIR}"/${PN}-1.3.15-ar.patch
 )
 
 pkg_setup() {
@@ -43,7 +44,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export CC
+	tc-export AR CC
 	emake "${myisoconf[@]}"
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/files/, app-cdr/isomaster/
@ 2024-10-09 13:15 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2024-10-09 13:15 UTC (permalink / raw
  To: gentoo-commits

commit:     d9e7b7ada02818e09971cd636ba0715a02177e40
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 13:14:54 2024 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 13:14:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e7b7ad

app-cdr/isomaster: Drop old

Bug: https://bugs.gentoo.org/941180
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 app-cdr/isomaster/Manifest                        |  2 -
 app-cdr/isomaster/files/isomaster-1.3.15-ar.patch | 25 --------
 app-cdr/isomaster/isomaster-1.3.15.ebuild         | 74 -----------------------
 app-cdr/isomaster/isomaster-1.3.16.ebuild         | 73 ----------------------
 4 files changed, 174 deletions(-)

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index a77e30a7f4eb..64ab10f2dab1 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,3 +1 @@
-DIST isomaster-1.3.15.tar.bz2 251622 BLAKE2B 9a3dd4e4a0d6aa0ff5b76774322e2f66257dda18e01835cad911f7abaa83584de1388a6c21bed8a8c8b5b9e94d4a2f23801e656b2586cb24b38b5aa4ca074c15 SHA512 08d4b12ba1f35e8fdca75b05b3125b046a03e1f1dab6876226b45c76e8a40fa78296854e8142a0864402563913af4c935ffe338777b593026e40e121b4089661
-DIST isomaster-1.3.16.tar.bz2 254872 BLAKE2B 18d6b656fc1d3bc1e9fcd727a14a581e954d6656d4c5fbb5d717ee46e434cb35f3d546484a8ac6d278cb13018cf427d4d97e6d442c05557c144bb2bc729b57e7 SHA512 431b99db3b304585fb2aac63630cd57294178a7a8b658e4a17119a35fc83ae2f8b4a80442f7a49566bf0e50bc40669b003da45a15d3cd2b2ab30fb76c1eaf89f
 DIST isomaster-1.3.17.tar.bz2 257663 BLAKE2B c62d0d2fe220fe3578f3d306815793f45a81b147628d2318b574e0c26876ddfa45169deb108ff332bf8e896a44734424402080843bdd713c68ea935b836220bb SHA512 77e7eee6f1e649442af921d629c4710fdf6fb009cbd429644bfb2eb2e66607b861d8855dc7d08a312eba444d1be180b1bb98f09d22cc25ab96f40e5c020c4ba1

diff --git a/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch b/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch
deleted file mode 100644
index 12c5ef4c3621..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.15-ar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1553ea30148f69bce545b3a79ab3f7847566c50a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 6 Feb 2021 19:36:33 +0100
-Subject: [PATCH] Makefile: Give external AR="$(tc-getAR)" a chance to win
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f005099..98808f8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -48,7 +48,7 @@ OPTFLAGS ?= -Wall
- 
- # programs used in the Makefiles:
- export CC      ?= gcc
--export AR      = ar
-+export AR      ?= ar
- export RM      = rm -f
- export INSTALL = install
- export CP      = cp
--- 
-2.30.0
-

diff --git a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild
deleted file mode 100644
index f9907cc82e04..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-4.1:4
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
-	"${FILESDIR}"/${PN}-1.3.15-ar.patch
-)
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		LIB_INIPARSER=iniparser4
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-4.1 || die
-}
-
-src_compile() {
-	tc-export AR 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 a/app-cdr/isomaster/isomaster-1.3.16.ebuild b/app-cdr/isomaster/isomaster-1.3.16.ebuild
deleted file mode 100644
index 4891c45cda6e..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.16.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-4.1:4
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
-)
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		LIB_INIPARSER=iniparser4
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-4.1 || die
-}
-
-src_compile() {
-	tc-export AR 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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/files/, app-cdr/isomaster/
@ 2025-01-07  5:20 Ionen Wolkens
  0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2025-01-07  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     3baff999862c0fb54bd916143648d69708c69671
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  7 02:02:44 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 05:18:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baff999

app-cdr/isomaster: update for unslotted iniparser

Have not really revised this ebuild, but fwiw also move the configs
into src_compile (no reason to do this in pkg_setup).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/isomaster-1.3.14-include-path.patch      | 25 ----------------
 ...er-1.3.17.ebuild => isomaster-1.3.17-r1.ebuild} | 34 ++++++++++------------
 2 files changed, 16 insertions(+), 43 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
deleted file mode 100644
index 520a355e595f..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-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.17.ebuild b/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild
similarity index 80%
rename from app-cdr/isomaster/isomaster-1.3.17.ebuild
rename to app-cdr/isomaster/isomaster-1.3.17-r1.ebuild
index bfed4c776be9..547f5024b765 100644
--- a/app-cdr/isomaster/isomaster-1.3.17.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs xdg-utils
+inherit flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
 HOMEPAGE="http://littlesvr.ca/isomaster"
@@ -14,36 +14,34 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/iniparser-4.1:4
+RDEPEND=">=dev-libs/iniparser-4.1-r2:=
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
-)
+src_prepare() {
+	default
+	rm -f configure || die #274361
+	rm -R iniparser-4.1 || die
+}
+
+src_compile() {
+	tc-export AR CC
+
+	# iniparser.pc only exists in >=4.2 and it changes headers location
+	has_version '>=dev-libs/iniparser-4.2' &&
+		append-cflags $($(tc-getPKG_CONFIG) --cflags iniparser || die)
 
-pkg_setup() {
 	myisoconf=(
 		DEFAULT_EDITOR=leafpad
 		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
 		USE_SYSTEM_INIPARSER=1
-		LIB_INIPARSER=iniparser4
 		PREFIX=/usr
-		)
+	)
 
 	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
 
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-4.1 || die
-}
-
-src_compile() {
-	tc-export AR CC
 	emake "${myisoconf[@]}"
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-07  5:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-05 15:19 [gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/files/, app-cdr/isomaster/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2021-02-06 18:49 Sebastian Pipping
2024-10-09 13:15 Sebastian Pipping
2025-01-07  5:20 Ionen Wolkens

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox