Clean up patches. Remove weird USE=unicode.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 22 insertions, 473 deletions

diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog
index 6aaee4d4a02d..91b30253ee68 100644
--- a/app-mobilephone/yaps/ChangeLog
+++ b/app-mobilephone/yaps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/yaps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.32 2014/09/15 08:48:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.33 2014/09/15 08:56:17 jer Exp $
+
+  15 Sep 2014; Jeroen Roovers <jer@gentoo.org> yaps-0.96-r5.ebuild,
+  files/yaps-0.96-gentoo.diff, -files/yaps-0.96-gentoo.patch,
+  files/yaps-0.96-getline-rename.patch:
+  Clean up patches. Remove weird USE=unicode.
 
   15 Sep 2014; Jeroen Roovers <jer@gentoo.org> yaps-0.96-r5.ebuild,
   +files/yaps-0.96-string.patch:
diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff b/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff
index 98f528c30116..c77bcd5d4912 100644
--- a/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff
+++ b/app-mobilephone/yaps/files/yaps-0.96-gentoo.diff
@@ -1,5 +1,5 @@
---- Config.orig	2005-06-02 20:28:35.000000000 +0200
-+++ Config	2005-10-16 15:13:32.000000000 +0200
+--- a/Config
++++ b/Config
 @@ -24,9 +24,9 @@
  #	Name of local configuration file (location is $HOME.)
  YAPS_LCFGFILE 	= .yapsrc
@@ -28,8 +28,8 @@
  endif
  ifdef	MATH
  LLIBS	+= -lm
---- Makefile.orig	2005-06-02 20:33:27.000000000 +0200
-+++ Makefile	2005-10-16 15:13:32.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -33,19 +33,19 @@
  	lynx -cfg=/dev/null -nolist -dump $< > $@
  
diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch b/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
deleted file mode 100644
index 24929f21dccd..000000000000
--- a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
+++ /dev/null
@@ -1,443 +0,0 @@
---- Config.orig	2005-06-02 20:28:35.000000000 +0200
-+++ Config	2005-10-16 15:13:32.000000000 +0200
-@@ -24,9 +24,9 @@
- #	Name of local configuration file (location is $HOME.)
- YAPS_LCFGFILE 	= .yapsrc
- #	Directory for installing the binary
--YAPS_BINDIR	= /usr/local/bin
-+YAPS_BINDIR	= /usr/bin
- #	Directory for optional support files
--YAPS_LIBDIR	= /usr/local/lib/yaps
-+YAPS_LIBDIR	= /usr/lib/yaps
- #	User/Group/Mode for yaps
- YAPS_USER	= bin
- YAPS_GROUP	= uucp
-@@ -43,12 +43,12 @@
- ifdef	SLANG
- LDEFS	+= -DSCRIPT_SLANG
- LLIBS	+= -lslang
--MATH	= True
-+#MATH	= True
- endif
- ifdef	LUA
- LDEFS	+= -DSCRIPT_LUA
--LLIBS	+= -llualib -llua
--MATH	= True
-+LLIBS	+= `pkg-config --libs lua`
-+#MATH	= True
- endif
- ifdef	MATH
- LLIBS	+= -lm
---- Makefile.orig	2005-06-02 20:33:27.000000000 +0200
-+++ Makefile	2005-10-16 15:13:32.000000000 +0200
-@@ -33,19 +33,19 @@
- 	lynx -cfg=/dev/null -nolist -dump $< > $@
- 
- install:	$(DSTFLE) $(CFGFILE)
--	if [ ! -d $(YAPS_LIBDIR) ]; then \
--		install -d -m 755 -o $(YAPS_USER) -g $(YAPS_GROUP) $(YAPS_LIBDIR) ; \
-+	if [ ! -d $(DESTDIR)$(YAPS_LIBDIR) ]; then \
-+		install -d -m 755 $(DESTDIR)$(YAPS_LIBDIR) ; \
- 	fi
- 	@if [ -f contrib/Makefile ]; then	\
- 		$(MAKE) -C contrib install ;	\
- 	fi
- 
- $(DSTFLE):	yaps
--	install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@
-+	install -m $(YAPS_MODE) -s yaps $(DESTDIR)$@
- 
- $(CFGFILE):	yaps.rc
- 	@if [ ! -f $@ ]; then \
--		install -o $(YAPS_RCUSER) -g $(YAPS_RCGROUP) -m $(YAPS_RCMODE) -s yaps.rc $@ ; \
-+		install -m $(YAPS_RCMODE) -s yaps.rc $(DESTDIR)$@ ; \
- 	fi
- 
- clean:
---- yaps.rc.orig	2005-06-02 20:28:35.000000000 +0200
-+++ yaps.rc	2005-10-16 15:13:32.000000000 +0200
-@@ -9,26 +9,28 @@
- #	This is a comma seperated list of available services. This
- #	is required for autodetect the matching service for a
- #	pager-id
--services	D1,D2,E+
--+services	Telmi,Telmi-Fun,Telmi-Family,Telmi-Top,Telmi-Pro
--+services	Skyper,Quix
-+services        D1-0160, D1-0170, D1-0171, D1-0175
-++services       D2-0172, D2-0173, D2-0174, D2-0174
-++services       E+0177, E+0178
-++services       Telmi,Telmi-Fun,Telmi-Family,Telmi-Top,Telmi-Pro
-++services       Skyper,Quix,Cityruf
- #
- #	This is the default caller-id. If the protocol/service allowes
- #	it, this is inserted in the message (and the receiver gets this
- #	as the sender's number)
--call-id		+1-(555)-1234
-+#call-id		0123-4567890
- #
- #	If you forget to sign your message, you can automatically append
- #	this string to each message.
--signature	(It's me!)
-+#signature	NAME
- #
- #	You can either switch the use of the signature here on for all
- #	services or in each service section for that particular service.
--use-signature	True
-+#use-signature	True
- #
- #	To get more verbose output when running yaps increase this value.
- #	Currently 4 is the highest supported value.
--verbose		0
-+verbose		4
- #
- #	If you'd like to log every sending session define this. It should
- #	point to a writeable file. If you install the software setgid, then
-@@ -88,12 +90,12 @@
- #
- #	Most services limit the length of a message to a specific length.
- #	Enter the value here to check valid messages
--#max-size	160
-+max-size	160
- 
- #
- #	If a message is longer than max-size, you can set this to split
- #	it off into several single messages of allowed length
--#may-split	True
-+may-split	True
- 
- #
- #	If a message is longer than max-size, you can set this to truncate
-@@ -107,7 +109,7 @@
- 
- #
- #	If the service allows using your caller-id set this to True.
--#use-call-id	True
-+use-call-id	True
- 
- #
- #	If the service is reachable over a phonenumber where the pager-id
-@@ -186,7 +188,8 @@
- 
- #
- #	Set this to the modem device you wish to use
--#device		/dev/modem
-+device		/dev/ttyS0
-+#device		/dev/ttyI5
- #device		/dev/cua1
- #device		/dev/cua/a
- 
-@@ -194,7 +197,7 @@
- #	Set this to the prefix of the lockfile use for the device. There
- #	are several places, and two common formats:
- #lock-prefix	/usr/spool/uucp/LCK..
--#lock-prefix	/var/spool/lock/LCK..
-+lock-prefix	/var/spool/lock/LCK..
- #lock-prefix	/var/spool/locks/LK.
- 
- #
-@@ -223,7 +226,57 @@
- #
- #	D1 (by Deutsche Telekom)
- #
--[D1]
-+[D1-0160]
-+protocol	tap
-+valid-pid	0160|0049160|49160
-+change-pid	0160
-+convert		*no-8bit,cv-d1
-+cv-d1		{
-+	Ä	[
-+	Ö	\
-+	Ü	~
-+	ä	{
-+	ö	|
-+	ü	~
-+	ß	^]
-+}
-++cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+phone		01712092522
-+# use this number for isdn-dialin:
-+# phone           01712521001
-+max-size	160
-+may-split	True
-+use-call-id	False
-+tap-old		True
-+#
-+#----------------------------------------------------------
-+#
-+[D1-0170]
-+protocol	tap
-+valid-pid	0170|0049170|49170
-+change-pid	0170
-+convert		*no-8bit,cv-d1
-+cv-d1		{
-+	Ä	[
-+	Ö	\
-+	Ü	~
-+	ä	{
-+	ö	|
-+	ü	~
-+	ß	^]
-+}
-++cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+phone		01712092522
-+# use this number for isdn-dialin:
-+# phone           01712521001
-+max-size	160
-+may-split	True
-+use-call-id	False
-+tap-old		True
-+#
-+#----------------------------------------------------------
-+#
-+[D1-0171]
- protocol	tap
- valid-pid	0171|0049171|49171
- change-pid	0171
-@@ -239,21 +292,100 @@
- }
- +cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
- phone		01712092522
-+# use this number for isdn-dialin:
-+# phone           01712521001
-+max-size	160
-+may-split	True
-+use-call-id	False
-+tap-old		True
-+#
-+#----------------------------------------------------------
-+#
-+[D1-0175]
-+protocol	tap
-+valid-pid	0175|0049175|49175
-+change-pid	0175
-+convert		*no-8bit,cv-d1
-+cv-d1		{
-+	Ä	[
-+	Ö	\
-+	Ü	~
-+	ä	{
-+	ö	|
-+	ü	~
-+	ß	^]
-+}
-++cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+phone		01712092522
-+# use this number for isdn-dialin:
-+# phone           01712521001
- max-size	160
- may-split	True
- use-call-id	False
- tap-old		True
- #
-+#----------------------------------------------------------
-+#
-+
-+
-+
-+#
- #	D2 (by Mannesmann Mobilfunk)
- #
--[D2]
--modem		standard-d2
-+[D2-0162]
-+modem		standard
-+protocol	ucp
-+valid-pid	0162|0049162|49162
-+change-pid	0162
-+convert		*no-8bit,cv-default
-++cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+# phone		01722278020
-+# use this number for isdn-dialin:
-+phone           01722278010
-+max-size	160
-+may-split	True
-+use-call-id	True
-+can-delay	True
-+can-expire	True
-+can-rds		True
-+check-call-id	>1111111111111111<
-+check-pager-id	>1111111111111111<
-+ucp-extend	True
-+#
-+#----------------------------------------------------------
-+#
-+[D2-0172]
-+modem		standard
- protocol	ucp
- valid-pid	0172|0049172|49172
- change-pid	0172
- convert		*no-8bit,cv-default
- +cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
--phone		01722278020
-+# phone		01722278020
-+# use this number for isdn-dialin:
-+phone           01722278010
-+max-size	160
-+may-split	True
-+use-call-id	True
-+can-delay	True
-+can-expire	True
-+can-rds		True
-+check-call-id	>1111111111111111<
-+check-pager-id	>1111111111111111<
-+ucp-extend	True
-+#
-+#----------------------------------------------------------
-+#
-+[D2-0173]
-+modem		standard
-+protocol	ucp
-+valid-pid	0173|0049173|49173|173
-+change-pid	0173
-+convert		*no-8bit,cv-default
-++cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+# phone		01722278020
-+# use this number for isdn-dialin:
-+phone           01722278010
- max-size	160
- may-split	True
- use-call-id	True
-@@ -264,10 +396,39 @@
- check-pager-id	>1111111111111111<
- ucp-extend	True
- #
-+#----------------------------------------------------------
-+#
-+[D2-0174]
-+modem		standard
-+protocol	ucp
-+valid-pid	0174|0049174|49174|174
-+change-pid	0174
-+convert		*no-8bit,cv-default
-++cost		timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+# phone		01722278020
-+# use this number for isdn-dialin:
-+phone           01722278010
-+max-size	160
-+may-split	True
-+use-call-id	True
-+can-delay	True
-+can-expire	True
-+can-rds		True
-+check-call-id	>1111111111111111<
-+check-pager-id	>1111111111111111<
-+ucp-extend	True
-+#
-+#----------------------------------------------------------
-+#
-+
-+
-+
-+#
-+#
- #	E+ (by ???)
- #	!! UNTESTED !!
- #
--[E+]
-+[E+0177]
- protocol	tap
- valid-pid	0177|0049177|49177
- change-pid	0177
-@@ -278,6 +439,22 @@
- may-split	True
- use-call-id	False
- #
-+#----------------------------------------------------------
-+#
-+[E+0178]
-+protocol        tap
-+valid-pid       0178|0049178|49178|0178
-+#change-pid     0178
-+convert         *no-8bit,cv-default
-++cost           timetable=Wk0800-1800=5.7;Wk1800-0800=11.4;Ss=11.4
-+phone           01771167
-+max-size        160
-+may-split       True
-+use-call-id     False
-+#
-+#----------------------------------------------------------
-+#
-+#
- #	Telmi, Telmi-* (by Deutsche Funkruf)
- #	!! ONLY TESTED FOR TELMI-FUN !!
- #
-@@ -326,6 +503,20 @@
- phone		016593
- max-size	80
- use-call-id	True
-+#
-+#		Cityruf
-+#	!!Used for emessage.de also!!
-+#
-+[Cityruf]
-+protocol       tap
-+valid-pid      0168|0164
-+change-pid     -
-+convert        *no-8bit,cv-default,cv-extend
-+phone          016902
-+max-size       80
-+use-call-id            False
-+insert-pager-id        False
-+truncate       True
- 
- #########################################
- #	modem section			#
-@@ -335,10 +526,10 @@
- #	Locking
- #
- #	Older Unix versions
--lock-prefix	/usr/spool/uucp/LCK..
-+#lock-prefix	/usr/spool/uucp/LCK..
- #	Newer Unix versions
- #lock-prefix	/var/spool/uucp/LCK..
--#lock-prefix	/var/lock/LCK..
-+lock-prefix	/var/lock/LCK..
- #	SysV4
- #lock-prefix	/var/spool/locks/LK.
- #lock-method	sysv4
-@@ -346,22 +537,38 @@
- #	Device
- #
- #	Typical a symbolic link to the real device
--device		/dev/modem
-+device		/dev/ttyS0
- #	"normal" call-out device
- #device		/dev/cua1
- #	Solaris convention
- #device		/dev/cua/a
-+# use the following device for isdn-dialout:
-+#device		/dev/ttyI6
-+# use the following device for CAPI
-+# syntax: CAPI/<controller>/<MSN>
-+#device		CAPI/1/12345
- 
- #
-+#
- #	Modem talk
- #
--init		\\r !200D ATZ\r <OK ATE0Q0V1\r <OK
--dial		ATD%L\r <60CONNECT|OK|BUSY|NO\sDIALTONE|NO\sCARRIER
--reset		ATZ\r <OK
-+#init		\\r !200D AT&F2\r <OK ATE0Q0V1M1L1X3\r <OK
-+init		\\r !200D AT&F2\r <OK ATV1M1L1X3\r <OK
-+
-+# use the following init-string for isdn:
-+# and change MSN to your MSN (what else...:-))
-+#init            \\r !200D ATZ\r <OK AT&E9879356\r <OK
-+
-+dial		ATDT0%L\r <60CONNECT|OK|BUSY|NO\sDIALTONE|NO\sCARRIER
-+reset		ATH\r <OK
- timeout		10
-+
-+
- #	Customizing an existing modem entry
--[standard-d2] standard
--local-init	AT\%C2\r <OK
-+#[standard-d2] standard
-+#local-init	AT\%C2\r <OK
-+
-+
- #
- #	alias section
- #
diff --git a/app-mobilephone/yaps/files/yaps-0.96-getline-rename.patch b/app-mobilephone/yaps/files/yaps-0.96-getline-rename.patch
index 9613abc73ebd..2b76b5bb39e2 100644
--- a/app-mobilephone/yaps/files/yaps-0.96-getline-rename.patch
+++ b/app-mobilephone/yaps/files/yaps-0.96-getline-rename.patch
@@ -1,6 +1,5 @@
-diff -Nru yaps-0.96.orig/cfg.c yaps-0.96/cfg.c
---- yaps-0.96.orig/cfg.c	1997-06-11 14:05:34.000000000 +0200
-+++ yaps-0.96/cfg.c	2009-07-12 11:32:02.000000000 +0200
+--- a/cfg.c
++++ b/cfg.c
 @@ -203,7 +203,7 @@
  			fcur -> fp = fp;
  			fcur -> up = NULL;
@@ -19,9 +18,8 @@ diff -Nru yaps-0.96.orig/cfg.c yaps-0.96/cfg.c
  									if ((*ptr != '}') || *(ptr + 1)) {
  										plen = strlen (ptr);
  										if (len + plen + 2 >= siz) {
-diff -Nru yaps-0.96.orig/cv.c yaps-0.96/cv.c
---- yaps-0.96.orig/cv.c	1997-06-03 20:43:52.000000000 +0200
-+++ yaps-0.96/cv.c	2009-07-12 11:31:44.000000000 +0200
+--- a/cv.c
++++ b/cv.c
 @@ -151,7 +151,7 @@
  	MCHK (c);
  	if ((! c) || (! (fp = fopen (fname, "r"))))
@@ -31,9 +29,8 @@ diff -Nru yaps-0.96.orig/cv.c yaps-0.96/cv.c
  		for (sp = line; isspace (*sp); ++sp)
  			;
  		if (*sp && (*sp != '#')) {
-diff -Nru yaps-0.96.orig/pager.h yaps-0.96/pager.h
---- yaps-0.96.orig/pager.h	1997-06-12 13:59:28.000000000 +0200
-+++ yaps-0.96/pager.h	2009-07-12 11:31:33.000000000 +0200
+--- a/pager.h
++++ b/pager.h
 @@ -67,7 +67,7 @@
  /*{{{	utility */
  extern char	*skip (char *str);
@@ -43,9 +40,8 @@ diff -Nru yaps-0.96.orig/pager.h yaps-0.96/pager.h
  extern int	verbose_out (char *, ...);
  /*}}}*/
  /*{{{	string handling */
-diff -Nru yaps-0.96.orig/util.c yaps-0.96/util.c
---- yaps-0.96.orig/util.c	1997-05-31 19:20:40.000000000 +0200
-+++ yaps-0.96/util.c	2009-07-12 11:31:49.000000000 +0200
+--- a/util.c
++++ b/util.c
 @@ -36,7 +36,7 @@
  }
  
@@ -55,9 +51,8 @@ diff -Nru yaps-0.96.orig/util.c yaps-0.96/util.c
  {
  	char	*buf;
  	int	size;
-diff -Nru yaps-0.96.orig/yaps.c yaps-0.96/yaps.c
---- yaps-0.96.orig/yaps.c	1997-06-14 12:25:56.000000000 +0200
-+++ yaps-0.96/yaps.c	2009-07-12 11:31:39.000000000 +0200
+--- a/yaps.c
++++ b/yaps.c
 @@ -1177,7 +1177,7 @@
  			fprintf (stderr, "Unable to open message file %s for reading\n", mfile);
  			return NULL;
diff --git a/app-mobilephone/yaps/yaps-0.96-r5.ebuild b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
index f25b14a2fa0c..cc0b7407b4ca 100644
--- a/app-mobilephone/yaps/yaps-0.96-r5.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.3 2014/09/15 08:48:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.4 2014/09/15 08:56:17 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="capi? ( ftp://ftp.melware.net/capi4yaps/${P}.c4.tgz )
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="+capi lua slang unicode"
+IUSE="+capi lua slang"
 
 RDEPEND="
 	capi? ( net-dialup/capi4k-utils )
@@ -39,14 +39,6 @@ src_prepare() {
 	if ! use capi; then
 		epatch "${FILESDIR}"/${P}-string.patch
 	fi
-
-	# if specified, convert all relevant files from latin1 to UTF-8
-	if use unicode; then
-		for i in yaps.doc; do
-			einfo "Converting '${i}' to UTF-8"
-			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-		done
-	fi
 }
 
 src_compile() {