From: Chris Bainbridge <chrb@gentoo.org>
Date: Mon, 13 Mar 2006 19:18:31 +0000 (+0000)
Subject: version bump, thanks to Pandor in bug #125997.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f93be5f42d86dcce14e8566f2603c65a10f01c2e;p=gentoo.git

version bump, thanks to Pandor in bug #125997.
Package-Manager: portage-2.0.54
---

diff --git a/app-cdr/extract-xiso/ChangeLog b/app-cdr/extract-xiso/ChangeLog
index 64ae9d0b368b..0b84a5672af7 100644
--- a/app-cdr/extract-xiso/ChangeLog
+++ b/app-cdr/extract-xiso/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/extract-xiso
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/extract-xiso/ChangeLog,v 1.12 2005/05/25 23:13:53 chrb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/extract-xiso/ChangeLog,v 1.13 2006/03/13 19:18:31 chrb Exp $
+
+*extract-xiso-2.5 (13 Mar 2006)
+
+  13 Mar 2006; <chrb@gentoo.org>
+  -files/extract-xiso-2.4_beta2-64bitfix.patch,
+  -files/extract-xiso-2.4_beta2-fnamefix.patch,
+  -extract-xiso-2.4_beta2.ebuild, -extract-xiso-2.4_beta2-r1.ebuild,
+  +extract-xiso-2.5.ebuild:
+  version bump, thanks to Pandor in bug #125997.
 
 *extract-xiso-2.4_beta2-r1 (26 May 2005)
 
diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
index b935037dfc07..31c92377d0ce 100644
--- a/app-cdr/extract-xiso/Manifest
+++ b/app-cdr/extract-xiso/Manifest
@@ -1,8 +1,4 @@
-MD5 cca39d4fa308baadc187ff688c159fee ChangeLog 1548
+MD5 1633ac953ef47313da4c2c74cfb00448 ChangeLog 1857
+MD5 723f1b4a7e6f7c2268ac4baf8b8aa2dd extract-xiso-2.5.ebuild 763
+MD5 d009c658b4c439a395272ff5cb45048b files/digest-extract-xiso-2.5 70
 MD5 a8ca88ebacaefc4911de517166780a68 metadata.xml 347
-MD5 e7de1a004918b6e258c49ca4a5ef30c6 extract-xiso-2.4_beta2.ebuild 859
-MD5 a843ca763117cf76d01d75e1997b691f extract-xiso-2.4_beta2-r1.ebuild 861
-MD5 a2a82a5ddb4e29acb7efe8cc8ae4bde4 files/digest-extract-xiso-2.4_beta2 72
-MD5 a2a82a5ddb4e29acb7efe8cc8ae4bde4 files/digest-extract-xiso-2.4_beta2-r1 72
-MD5 1e037b513b1e8010146089cde1a23a27 files/extract-xiso-2.4_beta2-64bitfix.patch 1709
-MD5 5b7049098c1011fc95d5a2c532e7f9da files/extract-xiso-2.4_beta2-fnamefix.patch 993
diff --git a/app-cdr/extract-xiso/extract-xiso-2.4_beta2-r1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.4_beta2-r1.ebuild
deleted file mode 100644
index 974ac0f31d17..000000000000
--- a/app-cdr/extract-xiso/extract-xiso-2.4_beta2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/extract-xiso/extract-xiso-2.4_beta2-r1.ebuild,v 1.1 2005/05/25 23:13:53 chrb Exp $
-
-inherit eutils
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
-HOMEPAGE="http://sourceforge.net/projects/extract-xiso"
-SRC_URI="mirror://sourceforge/extract-xiso/${PN}_src_v${MY_PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc ppc-macos amd64"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:-O2:${CFLAGS}:g" ${S}/Makefile || die "sed failed"
-	cd ${S}
-	epatch ${FILESDIR}/${P}-64bitfix.patch
-	epatch ${FILESDIR}/${P}-fnamefix.patch
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin extract-xiso || die "dobin failed"
-}
diff --git a/app-cdr/extract-xiso/extract-xiso-2.4_beta2.ebuild b/app-cdr/extract-xiso/extract-xiso-2.5.ebuild
similarity index 70%
rename from app-cdr/extract-xiso/extract-xiso-2.4_beta2.ebuild
rename to app-cdr/extract-xiso/extract-xiso-2.5.ebuild
index 6cbf9908baba..7128c8abbfc1 100644
--- a/app-cdr/extract-xiso/extract-xiso-2.4_beta2.ebuild
+++ b/app-cdr/extract-xiso/extract-xiso-2.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/extract-xiso/extract-xiso-2.4_beta2.ebuild,v 1.12 2005/05/21 10:03:19 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/extract-xiso/extract-xiso-2.5.ebuild,v 1.1 2006/03/13 19:18:31 chrb Exp $
 
 inherit eutils
 
 MY_PV=${PV/_beta/b}
 DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
 HOMEPAGE="http://sourceforge.net/projects/extract-xiso"
-SRC_URI="mirror://sourceforge/extract-xiso/${PN}_src_v${MY_PV}.tgz"
+SRC_URI="mirror://sourceforge/extract-xiso/${PN}_v${MY_PV}_src.tgz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,9 +21,6 @@ S="${WORKDIR}/${PN}"
 src_unpack() {
 	unpack ${A}
 	sed -i -e "s:-O2:${CFLAGS}:g" ${S}/Makefile || die "sed failed"
-	cd ${S}
-	epatch ${FILESDIR}/${P}-64bitfix.patch
-	epatch ${FILESDIR}/${P}-fnamefix.patch
 }
 
 src_compile() {
diff --git a/app-cdr/extract-xiso/files/digest-extract-xiso-2.4_beta2 b/app-cdr/extract-xiso/files/digest-extract-xiso-2.4_beta2
deleted file mode 100644
index bea2734b7ed8..000000000000
--- a/app-cdr/extract-xiso/files/digest-extract-xiso-2.4_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d05fa82f89dc8aaf05201ee15658982 extract-xiso_src_v2.4b2.tgz 206700
diff --git a/app-cdr/extract-xiso/files/digest-extract-xiso-2.4_beta2-r1 b/app-cdr/extract-xiso/files/digest-extract-xiso-2.4_beta2-r1
deleted file mode 100644
index bea2734b7ed8..000000000000
--- a/app-cdr/extract-xiso/files/digest-extract-xiso-2.4_beta2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d05fa82f89dc8aaf05201ee15658982 extract-xiso_src_v2.4b2.tgz 206700
diff --git a/app-cdr/extract-xiso/files/digest-extract-xiso-2.5 b/app-cdr/extract-xiso/files/digest-extract-xiso-2.5
new file mode 100644
index 000000000000..3e34a399727b
--- /dev/null
+++ b/app-cdr/extract-xiso/files/digest-extract-xiso-2.5
@@ -0,0 +1 @@
+MD5 1283bb3be0f17bfe511aff86cff0eb76 extract-xiso_v2.5_src.tgz 207052
diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.4_beta2-64bitfix.patch b/app-cdr/extract-xiso/files/extract-xiso-2.4_beta2-64bitfix.patch
deleted file mode 100644
index 7f673561195c..000000000000
--- a/app-cdr/extract-xiso/files/extract-xiso-2.4_beta2-64bitfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- extract-xiso.c~	2004-05-04 21:39:30.000000000 +0200
-+++ extract-xiso.c	2005-01-29 10:48:32.603567584 +0100
-@@ -631,7 +631,7 @@
- int extract_file( int in_xiso, dir_node *in_file, modes in_mode );
- int open_ftp_connection( char *in_host, char *in_user, char *in_password, FTP **out_ftp );
- int decode_xiso( char *in_xiso, char *in_path, modes in_mode, char **out_iso_path, bool in_ll_compat );
--int verify_xiso( int in_xiso, unsigned long *out_root_dir_sector, unsigned long *out_root_dir_size, char *in_iso_name );
-+int verify_xiso( int in_xiso, int32_t *out_root_dir_sector, int32_t *out_root_dir_size, char *in_iso_name );
- int traverse_xiso( int in_xiso, dir_node *in_dir_node, xoff_t in_dir_start, char *in_path, modes in_mode, dir_node_avl **in_root, bool in_ll_compat );
- int create_xiso( char *in_root_directory, char *in_output_directory, dir_node_avl *in_root, int in_xiso, char **out_iso_path, char *in_name, progress_callback in_progress_callback );
- 
-@@ -980,7 +980,7 @@
- #endif
- 
- 
--int verify_xiso( int in_xiso, unsigned long *out_root_dir_sector, unsigned long *out_root_dir_size, char *in_iso_name ) {
-+int verify_xiso( int in_xiso, int32_t *out_root_dir_sector, int32_t *out_root_dir_size, char *in_iso_name ) {
- 	int				err = 0;
- 	char			buffer[ XISO_HEADER_DATA_LENGTH ];
- 
-@@ -1187,7 +1187,7 @@
- int decode_xiso( char *in_xiso, char *in_path, modes in_mode, char **out_iso_path, bool in_ll_compat ) {
- 	dir_node_avl		   *root = nil;
- 	bool					repair = false;
--	unsigned long			root_dir_sect, root_dir_size;
-+	int32_t			root_dir_sect, root_dir_size;
- 	int						xiso, err = 0, len, path_len = 0, add_slash = 0;
- 	char				   *buf, *cwd = nil, *name = nil, *short_name = nil, *iso_name;
- 
diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.4_beta2-fnamefix.patch b/app-cdr/extract-xiso/files/extract-xiso-2.4_beta2-fnamefix.patch
deleted file mode 100644
index f7628bfe6239..000000000000
--- a/app-cdr/extract-xiso/files/extract-xiso-2.4_beta2-fnamefix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Common subdirectories: extract-xiso.orig/darwin and extract-xiso/darwin
-diff -u extract-xiso.orig/extract-xiso.c extract-xiso/extract-xiso.c
---- extract-xiso.orig/extract-xiso.c	2005-05-21 10:59:45.065431800 +0000
-+++ extract-xiso/extract-xiso.c	2005-05-21 10:59:23.935644016 +0000
-@@ -1345,6 +1345,11 @@
- 	if ( ! err ) {
- 		if ( read( in_xiso, dir->filename, dir->filename_length ) != dir->filename_length ) read_err();
- 		if ( ! err ) dir->filename[ dir->filename_length ] = 0;
-+		if (strstr(dir->filename,"..") || strchr(dir->filename, '/') || strchr(dir->filename, '\\'))
-+		  {
-+		    printf("Filename contains invalid characters");
-+		    exit(1);
-+		  }
- 	}
- 
- 	if ( ! err && in_mode == k_generate_avl ) {
-Common subdirectories: extract-xiso.orig/libftp-5.0.1.modified.by.in and extract-xiso/libftp-5.0.1.modified.by.in
-Common subdirectories: extract-xiso.orig/visual_c++_project and extract-xiso/visual_c++_project
-Common subdirectories: extract-xiso.orig/win32 and extract-xiso/win32