Fixed the patch and installation of header-files.

(Portage version: 2.1.2_rc1)

3 files changed, 134 insertions, 53 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index e0db18b6ae14..5b81caf88821 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.158 2006/10/28 10:59:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.159 2006/10/28 15:16:01 pylon Exp $
+
+  28 Oct 2006; Lars Weiler <pylon@gentoo.org> files/mkisofs-iconv-18.patch,
+  cdrtools-2.01.01_alpha18.ebuild:
+  Fixed the patch and installation of header-files.
 
 *cdrtools-2.01.01_alpha18 (28 Oct 2006)
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha18.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha18.ebuild
index 0a24ee0f4fe6..721470386185 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha18.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha18.ebuild,v 1.1 2006/10/28 10:59:51 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha18.ebuild,v 1.2 2006/10/28 15:16:01 pylon Exp $
 
 inherit eutils gnuconfig toolchain-funcs flag-o-matic
 
@@ -32,7 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.01.01a01-scanbus.patch
 	epatch "${FILESDIR}"/${PN}-2.01.01a18-rezero.patch
 
-	use unicode && epatch "${FILESDIR}"/mkisofs-iconv-18.patch
+	#use unicode && epatch "${FILESDIR}"/mkisofs-iconv-18.patch
 
 	# ppc-macos support
 	cd "${S}"/DEFAULTS
@@ -90,7 +90,7 @@ src_install() {
 
 	cd "${S}"
 	insinto /usr/include/scsilib
-	doins include/*.h
+	doins include/schily/*.h
 	insinto /usr/include/scsilib/scg
 	doins include/scg/*.h
 
diff --git a/app-cdr/cdrtools/files/mkisofs-iconv-18.patch b/app-cdr/cdrtools/files/mkisofs-iconv-18.patch
index 020da8f69db2..9c565794bf3f 100644
--- a/app-cdr/cdrtools/files/mkisofs-iconv-18.patch
+++ b/app-cdr/cdrtools/files/mkisofs-iconv-18.patch
@@ -1,6 +1,6 @@
-diff -urp cdrtools-2.01.01.orig/include/schily/unls.h cdrtools-2.01.01/include/schily/unls.h
---- cdrtools-2.01.01.orig/include/schily/unls.h	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/include/schily/unls.h	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/include/schily/unls.h cdrtools-2.01.01/include/schily/unls.h
+--- cdrtools-2.01.01.orig/include/schily/unls.h	2006-10-10 10:24:15.000000000 +0200
++++ cdrtools-2.01.01/include/schily/unls.h	2006-10-28 16:59:33.000000000 +0200
 @@ -23,6 +23,10 @@
  #include <schily/mconfig.h>
  #endif
@@ -32,20 +32,9 @@ diff -urp cdrtools-2.01.01.orig/include/schily/unls.h cdrtools-2.01.01/include/s
  
  #ifdef	__cplusplus
  }
-Only in cdrtools-2.01.01/include/schily: unls.h.orig
-diff -urp cdrtools-2.01.01.orig/libunls/Targets cdrtools-2.01.01/libunls/Targets
---- cdrtools-2.01.01.orig/libunls/Targets	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/libunls/Targets	2006-10-28 11:24:22.000000000 +0200
-@@ -39,4 +39,5 @@ CFILES=	nls_base.c \
- 	nls_cp10029.c \
- 	nls_cp10079.c \
- 	nls_cp10081.c \
--	nls_file.c
-+	nls_file.c \
-+	nls_iconv.c
-diff -urp cdrtools-2.01.01.orig/libunls/libunls.mk cdrtools-2.01.01/libunls/libunls.mk
---- cdrtools-2.01.01.orig/libunls/libunls.mk	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/libunls/libunls.mk	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/libunls/libunls.mk cdrtools-2.01.01/libunls/libunls.mk
+--- cdrtools-2.01.01.orig/libunls/libunls.mk	2000-03-25 13:51:56.000000000 +0100
++++ cdrtools-2.01.01/libunls/libunls.mk	2006-10-28 16:59:33.000000000 +0200
 @@ -8,6 +8,7 @@ include		$(SRCROOT)/$(RULESDIR)/rules.to
  INSDIR=		lib
  TARGETLIB=	unls
@@ -54,9 +43,9 @@ diff -urp cdrtools-2.01.01.orig/libunls/libunls.mk cdrtools-2.01.01/libunls/libu
  include		Targets
  LIBS=		
  
-diff -urp cdrtools-2.01.01.orig/libunls/nls.h cdrtools-2.01.01/libunls/nls.h
---- cdrtools-2.01.01.orig/libunls/nls.h	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/libunls/nls.h	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/libunls/nls.h cdrtools-2.01.01/libunls/nls.h
+--- cdrtools-2.01.01.orig/libunls/nls.h	2006-09-13 17:09:14.000000000 +0200
++++ cdrtools-2.01.01/libunls/nls.h	2006-10-28 16:59:33.000000000 +0200
 @@ -110,5 +110,8 @@ extern int init_unls_cp10029	__PR((void)
  extern int init_unls_cp10079	__PR((void));
  extern int init_unls_cp10081	__PR((void));
@@ -66,22 +55,103 @@ diff -urp cdrtools-2.01.01.orig/libunls/nls.h cdrtools-2.01.01/libunls/nls.h
 +#endif
  
  #endif	/* _NLS_H */
-Only in cdrtools-2.01.01/libunls: nls_iconv.c
-diff -urp cdrtools-2.01.01.orig/mkisofs/Makefile cdrtools-2.01.01/mkisofs/Makefile
---- cdrtools-2.01.01.orig/mkisofs/Makefile	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/mkisofs/Makefile	2006-10-28 11:24:22.000000000 +0200
-@@ -33,6 +33,7 @@ CPPOPTS +=	-DAPPLE_HYB
- CPPOPTS +=	-DUDF
- CPPOPTS +=	-DDVD_VIDEO
- CPPOPTS +=	-DSORTING
-+CPPOPTS +=	-DUSE_ICONV
- CPPOPTS +=	-I../libhfs_iso/
- CPPOPTS	+=	-DUSE_SCG \
- 		'-DAPPID_DEFAULT="MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING"' \
-Only in cdrtools-2.01.01/mkisofs: Makefile.orig
-diff -urp cdrtools-2.01.01.orig/mkisofs/joliet.c cdrtools-2.01.01/mkisofs/joliet.c
---- cdrtools-2.01.01.orig/mkisofs/joliet.c	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/mkisofs/joliet.c	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/libunls/nls_iconv.c cdrtools-2.01.01/libunls/nls_iconv.c
+--- cdrtools-2.01.01.orig/libunls/nls_iconv.c	1970-01-01 01:00:00.000000000 +0100
++++ cdrtools-2.01.01/libunls/nls_iconv.c	2006-10-28 16:58:38.000000000 +0200
+@@ -0,0 +1,80 @@
++/* @(#)nls_iconv.c     1.0 02/04/20 2002 J. Schilling  */
++#ifndef lint
++static char sccsid[] =
++       "@(#)nls_iconv.c        1.0 02/01/20 2002 J. Schilling";
++#endif
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; see the file COPYING.  If not, write to
++ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++/*
++ *     Modifications to make the code portable Copyright (c) 2000 J. Schilling
++ *
++ * nls_iconv: create a pseudo-charset table to use iconv() provided by C
++ * library or libiconv by Bruno Haible
++ * The Unicode to charset table has only exact mappings.
++ *
++ *
++ * Jungshik Shin (jshin@mailaps.org) 04-Feb-2002
++ */
++
++#ifdef USE_ICONV
++#include <mconfig.h>
++#include <stdio.h>
++#include <stdxlib.h>   
++#include <strdefs.h>
++#include "nls.h"
++#include <iconv.h>                                                                                                                                     
++                                                                                                                                                       
++
++int
++init_unls_iconv(charset)
++       char    *charset;
++{
++       iconv_t iconv_d;  /* iconv conversion descriptor */
++       struct unls_table *table;
++
++       /* give up if no charset is given */
++       if (charset == NULL)
++               return -1;
++
++       /* see if we already have a table with this name - built in tables
++          have precedence over iconv() - i.e. can't have the name of an
++          existing table. Also, we may have already registered this file
++          table */
++       if (find_unls(charset) != NULL)
++               return -1;
++
++       if ((iconv_d = iconv_open("UCS-2BE", charset)) == (iconv_t) -1)
++               return -1;
++
++
++       /* set up the table */
++       if ((table = (struct unls_table *)malloc(sizeof (struct unls_table)))
++                                                       == NULL) {
++               return -1;
++       }
++
++       /* give the table the file name, so we can find it again if needed */
++       table->unls_name = strdup(charset);
++       table->iconv_d = iconv_d;
++       table->unls_uni2cs = NULL;
++       table->unls_cs2uni = NULL;
++       table->unls_next = NULL;
++
++       /* register the table */
++       return register_unls(table);
++}
++#endif
++
+diff -Naurp cdrtools-2.01.01.orig/libunls/Targets cdrtools-2.01.01/libunls/Targets
+--- cdrtools-2.01.01.orig/libunls/Targets	2002-12-03 01:34:27.000000000 +0100
++++ cdrtools-2.01.01/libunls/Targets	2006-10-28 16:59:33.000000000 +0200
+@@ -39,4 +39,5 @@ CFILES=	nls_base.c \
+ 	nls_cp10029.c \
+ 	nls_cp10079.c \
+ 	nls_cp10081.c \
+-	nls_file.c
++	nls_file.c \
++	nls_iconv.c
+diff -Naurp cdrtools-2.01.01.orig/mkisofs/joliet.c cdrtools-2.01.01/mkisofs/joliet.c
+--- cdrtools-2.01.01.orig/mkisofs/joliet.c	2006-10-08 15:48:36.000000000 +0200
++++ cdrtools-2.01.01/mkisofs/joliet.c	2006-10-28 16:59:33.000000000 +0200
 @@ -90,6 +90,11 @@ static	char sccsid[] =
  #include <schily/unls.h>	/* For UNICODE translation */
  #include <schily/schily.h>
@@ -412,10 +482,20 @@ diff -urp cdrtools-2.01.01.orig/mkisofs/joliet.c cdrtools-2.01.01/mkisofs/joliet
  	}
  	if (*rpnt)
  		return (1);
-Only in cdrtools-2.01.01/mkisofs: joliet.c.orig
-diff -urp cdrtools-2.01.01.orig/mkisofs/mkisofs.c cdrtools-2.01.01/mkisofs/mkisofs.c
---- cdrtools-2.01.01.orig/mkisofs/mkisofs.c	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/mkisofs/mkisofs.c	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/mkisofs/Makefile cdrtools-2.01.01/mkisofs/Makefile
+--- cdrtools-2.01.01.orig/mkisofs/Makefile	2006-10-08 13:51:43.000000000 +0200
++++ cdrtools-2.01.01/mkisofs/Makefile	2006-10-28 16:59:33.000000000 +0200
+@@ -33,6 +33,7 @@ CPPOPTS +=	-DAPPLE_HYB
+ CPPOPTS +=	-DUDF
+ CPPOPTS +=	-DDVD_VIDEO
+ CPPOPTS +=	-DSORTING
++CPPOPTS +=	-DUSE_ICONV
+ CPPOPTS +=	-I../libhfs_iso/
+ CPPOPTS	+=	-DUSE_SCG \
+ 		'-DAPPID_DEFAULT="MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING"' \
+diff -Naurp cdrtools-2.01.01.orig/mkisofs/mkisofs.c cdrtools-2.01.01/mkisofs/mkisofs.c
+--- cdrtools-2.01.01.orig/mkisofs/mkisofs.c	2006-10-08 19:55:12.000000000 +0200
++++ cdrtools-2.01.01/mkisofs/mkisofs.c	2006-10-28 16:59:33.000000000 +0200
 @@ -64,6 +64,11 @@ static	char sccsid[] =
  #endif
  #endif	/* no_more_needed */
@@ -490,10 +570,9 @@ diff -urp cdrtools-2.01.01.orig/mkisofs/mkisofs.c cdrtools-2.01.01/mkisofs/mkiso
  		exit(1);
  	}
  
-Only in cdrtools-2.01.01/mkisofs: mkisofs.c.orig
-diff -urp cdrtools-2.01.01.orig/mkisofs/mkisofs.h cdrtools-2.01.01/mkisofs/mkisofs.h
---- cdrtools-2.01.01.orig/mkisofs/mkisofs.h	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/mkisofs/mkisofs.h	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/mkisofs/mkisofs.h cdrtools-2.01.01/mkisofs/mkisofs.h
+--- cdrtools-2.01.01.orig/mkisofs/mkisofs.h	2006-10-08 19:55:12.000000000 +0200
++++ cdrtools-2.01.01/mkisofs/mkisofs.h	2006-10-28 16:59:33.000000000 +0200
 @@ -513,9 +513,14 @@ extern int get_session_start __PR((int *
  
  /* joliet.c */
@@ -510,10 +589,9 @@ diff -urp cdrtools-2.01.01.orig/mkisofs/mkisofs.h cdrtools-2.01.01/mkisofs/mkiso
  #endif
  extern unsigned char conv_charset __PR((unsigned char, struct unls_table *,
  				struct unls_table *));
-Only in cdrtools-2.01.01/mkisofs: mkisofs.h.orig
-diff -urp cdrtools-2.01.01.orig/mkisofs/udf.c cdrtools-2.01.01/mkisofs/udf.c
---- cdrtools-2.01.01.orig/mkisofs/udf.c	2006-10-28 11:24:03.000000000 +0200
-+++ cdrtools-2.01.01/mkisofs/udf.c	2006-10-28 11:24:22.000000000 +0200
+diff -Naurp cdrtools-2.01.01.orig/mkisofs/udf.c cdrtools-2.01.01/mkisofs/udf.c
+--- cdrtools-2.01.01.orig/mkisofs/udf.c	2006-10-08 15:49:56.000000000 +0200
++++ cdrtools-2.01.01/mkisofs/udf.c	2006-10-28 16:59:33.000000000 +0200
 @@ -439,7 +439,7 @@ set_ostaunicode(dst, dst_size, src)
  	int i;
  	int expanded_length;
@@ -523,4 +601,3 @@ diff -urp cdrtools-2.01.01.orig/mkisofs/udf.c cdrtools-2.01.01/mkisofs/udf.c
  	if (expanded_length > 1024)
  		expanded_length = 1024;
  	if (expanded_length > (dst_size-1)*2)
-Only in cdrtools-2.01.01/mkisofs: udf.c.orig