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

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

[Mike Frysinger]

commit:     42d326910296516e090e33ce16da6a3ced0f16d8
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 09:18:21 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 09:18:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d32691

extract-xiso: fix various missing prototype warnings

 app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild       |  6 ++++--
 .../files/extract-xiso-2.7.1-headers.patch           | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
index 21da94d..acadabd 100644
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 MY_PV=${PV/_beta/b}
 
@@ -20,6 +20,7 @@ IUSE=""
 S=${WORKDIR}/${PN}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.7.1-headers.patch
 	sed -i \
 		-e 's:__LINUX__:__linux__:' \
 		*.[ch] */*.[ch] || die
@@ -28,7 +29,8 @@ src_prepare() {
 doit() { echo "$@"; "$@"; }
 
 src_compile() {
-	doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+	# Need _GNU_SOURCE here for asprintf prototype.
+	doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} \
 		extract-xiso.c libftp-*/*.c -o extract-xiso || die
 }
 

diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch b/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
new file mode 100644
index 0000000..3de7970
--- /dev/null
+++ b/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
@@ -0,0 +1,20 @@
+fix missing prototype warnings
+
+--- a/libftp-5.0.1.modified.by.in/FtpLibrary.h
++++ b/libftp-5.0.1.modified.by.in/FtpLibrary.h
+@@ -20,6 +20,7 @@
+     extern "C" {
+ #endif
+ 
++#include <ctype.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+@@ -33,6 +34,7 @@
+ #include <sys/time.h>
+ #include <sys/socket.h>
+ #include <arpa/ftp.h>
++#include <arpa/inet.h>
+ #include <arpa/telnet.h>
+ #include <netinet/in.h>
+ #include <netdb.h>

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

[Sam James]

commit:     a7f293564d6ee7318186c54b47757118e21f0cbd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 22:17:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 22:25:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f29356

app-cdr/extract-xiso: drop 2.7.1

Bug: https://bugs.gentoo.org/886659
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-cdr/extract-xiso/Manifest                      |  1 -
 app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild     | 42 ----------------------
 .../files/extract-xiso-2.7.1-headers.patch         | 20 -----------
 3 files changed, 63 deletions(-)

diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
index f92cfad8bd6a..b738e9b8ef90 100644
--- a/app-cdr/extract-xiso/Manifest
+++ b/app-cdr/extract-xiso/Manifest
@@ -1,2 +1 @@
-DIST extract-xiso-2.7.1.tar.gz 207518 BLAKE2B bf99e2555e85344db318bdedf0e6dfb80b5f8cd079dc2083ba94e06c62032235d88296909a1aa887180ce94ce9d80a6b39aab25ed99b04741951aed79c2e8cdb SHA512 a7153d96fa7cfb01dfa385a0984d94dc0fa5ac14ce9f7e2d50287b7e1edbb6a4ba84b6b874aa2628b1a82f23b30687958e411699487896cc48787f48e0e012c6
 DIST extract-xiso-2.7.1_p202204252159.tar.gz 26979 BLAKE2B e313f78a6c835cbb87467a4509c576e589e05103c5723ecf224b85e5ca6f55cbdcf290c98bc03a745e2a24b2eca3368aea7dffe894300312e2b6287873258f9b SHA512 459a69a95f9680fb4659e30a777694b1ea37087742885e2d06338eab985d9d5734b4571fe7222d1e11489457d584b9da999c2bfb455f3d5eadcf36c8e4c8d844

diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
deleted file mode 100644
index f4e6324db818..000000000000
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
-HOMEPAGE="https://sourceforge.net/projects/extract-xiso"
-SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz"
-S="${WORKDIR}"/${PN}
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.1-headers.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:__LINUX__:__linux__:' \
-		*.[ch] */*.[ch] || die
-}
-
-doit() { echo "$@"; "$@"; }
-
-src_compile() {
-	# Need _GNU_SOURCE here for asprintf prototype.
-	doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} \
-		extract-xiso.c libftp-*/*.c -o extract-xiso || die
-}
-
-src_install() {
-	dobin extract-xiso
-	dodoc README.TXT
-}

diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch b/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
deleted file mode 100644
index 3de797050b43..000000000000
--- a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix missing prototype warnings
-
---- a/libftp-5.0.1.modified.by.in/FtpLibrary.h
-+++ b/libftp-5.0.1.modified.by.in/FtpLibrary.h
-@@ -20,6 +20,7 @@
-     extern "C" {
- #endif
- 
-+#include <ctype.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdarg.h>
-@@ -33,6 +34,7 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <arpa/ftp.h>
-+#include <arpa/inet.h>
- #include <arpa/telnet.h>
- #include <netinet/in.h>
- #include <netdb.h>