diff options
Diffstat (limited to 'app-cdr/isomaster')
| -rw-r--r-- | app-cdr/isomaster/Manifest | 3 | ||||
| -rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.15-ar.patch | 25 | ||||
| -rw-r--r-- | app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch | 24 | ||||
| -rw-r--r-- | app-cdr/isomaster/isomaster-1.3.13.ebuild | 72 | ||||
| -rw-r--r-- | app-cdr/isomaster/isomaster-1.3.15.ebuild | 5 | ||||
| -rw-r--r-- | app-cdr/isomaster/isomaster-1.3.16.ebuild (renamed from app-cdr/isomaster/isomaster-1.3.14.ebuild) | 8 | ||||
| -rw-r--r-- | app-cdr/isomaster/metadata.xml | 2 |
7 files changed, 34 insertions, 105 deletions
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest index fb6fa14901c1..8d92431d3d3e 100644 --- a/app-cdr/isomaster/Manifest +++ b/app-cdr/isomaster/Manifest @@ -1,3 +1,2 @@ -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 +DIST isomaster-1.3.16.tar.bz2 254872 BLAKE2B 18d6b656fc1d3bc1e9fcd727a14a581e954d6656d4c5fbb5d717ee46e434cb35f3d546484a8ac6d278cb13018cf427d4d97e6d442c05557c144bb2bc729b57e7 SHA512 431b99db3b304585fb2aac63630cd57294178a7a8b658e4a17119a35fc83ae2f8b4a80442f7a49566bf0e50bc40669b003da45a15d3cd2b2ab30fb76c1eaf89f 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 000000000000..12c5ef4c3621 --- /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/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 902028a660a2..000000000000 --- 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 <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.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild deleted file mode 100644 index 338a5fea68fc..000000000000 --- a/app-cdr/isomaster/isomaster-1.3.13.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild index 4409476a71a0..f9907cc82e04 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[@]}" } diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.16.ebuild index cbe941cb2b92..4891c45cda6e 100644 --- a/app-cdr/isomaster/isomaster-1.3.14.ebuild +++ b/app-cdr/isomaster/isomaster-1.3.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" RDEPEND=">=dev-libs/iniparser-4.1:4 @@ -21,7 +21,7 @@ DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.19.1 )" # bug 512448 PATCHES=( - "${FILESDIR}"/${P}-include-path.patch + "${FILESDIR}"/${PN}-1.3.14-include-path.patch ) pkg_setup() { @@ -43,7 +43,7 @@ src_prepare() { } src_compile() { - tc-export CC + tc-export AR CC emake "${myisoconf[@]}" } diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml index 6d2298876faa..6a22e9e318bb 100644 --- a/app-cdr/isomaster/metadata.xml +++ b/app-cdr/isomaster/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> |