fixing broken patch with USE flag 'capi', see #105676

(Portage version: 2.0.53_rc5)

5 files changed, 30 insertions, 33 deletions

diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog
index 7f40f84749bf..0f1ed2483117 100644
--- a/app-mobilephone/yaps/ChangeLog
+++ b/app-mobilephone/yaps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/yaps
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.6 2005/10/15 07:57:30 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.7 2005/10/16 13:48:06 sbriesen Exp $
+
+  16 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  files/yaps-0.96-gentoo.patch, metadata.xml, yaps-0.96-r1.ebuild:
+  fixing broken patch with USE flag 'capi', see #105676
 
 *yaps-0.96-r1 (15 Oct 2005)
 
diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest
index 09db234e2237..6c30d11e4d2e 100644
--- a/app-mobilephone/yaps/Manifest
+++ b/app-mobilephone/yaps/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 69e77ba8276e4ac896dfb9ea0a5e385f yaps-0.96.ebuild 1705
 MD5 b7ad315314ccaeebdb971d92dea2fdd5 ChangeLog 1020
-MD5 2e3ea70bd2303c7b7915e056bdd44066 metadata.xml 258
-MD5 1752094160adb45d845df8165dc8ac27 yaps-0.96-r1.ebuild 1716
-MD5 8cd1ba9738bbe553fc3d400dd7f7c20c files/yaps-0.96.patch 9867
-MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96-r1 121
-MD5 c2e46937aabed37f4cf0d69954e3f058 files/yaps-0.96-gentoo.patch 10516
 MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96 121
+MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96-r1 121
 MD5 836bccf5ccea5152fa69261df18d3bb9 files/yaps-0.96-capiv3.patch 1820
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDULaCNSP4Vda7IdsRAntuAJ4gvwdHDMxwImkidI9kwTfvezCIwgCgkBR8
-I6r/LCVkl8TmNENCjFADmbI=
-=KjIS
------END PGP SIGNATURE-----
+MD5 0c53ad04e9340b9379a31756ac378afa files/yaps-0.96-gentoo.patch 10303
+MD5 8cd1ba9738bbe553fc3d400dd7f7c20c files/yaps-0.96.patch 9867
+MD5 28d5cc02fcd84c57b54cc995fbc506e7 metadata.xml 373
+MD5 bb7f4f06c4ccb8959257c978b89119a2 yaps-0.96-r1.ebuild 1720
+MD5 69e77ba8276e4ac896dfb9ea0a5e385f yaps-0.96.ebuild 1705
diff --git a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch b/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
index 1ff61008f240..24929f21dccd 100644
--- a/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
+++ b/app-mobilephone/yaps/files/yaps-0.96-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Nru yaps-0.96.orig/Config yaps-0.96/Config
---- yaps-0.96.orig/Config	1997-06-14 13:32:18.000000000 +0300
-+++ yaps-0.96/Config	2005-10-15 10:32:51.751042480 +0300
+--- 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
@@ -29,9 +28,8 @@ diff -Nru yaps-0.96.orig/Config yaps-0.96/Config
  endif
  ifdef	MATH
  LLIBS	+= -lm
-diff -Nru yaps-0.96.orig/Makefile yaps-0.96/Makefile
---- yaps-0.96.orig/Makefile	1997-06-06 14:45:35.000000000 +0300
-+++ yaps-0.96/Makefile	2005-10-15 10:32:51.752042328 +0300
+--- 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 $< > $@
  
@@ -56,9 +54,8 @@ diff -Nru yaps-0.96.orig/Makefile yaps-0.96/Makefile
  	fi
  
  clean:
-diff -Nru yaps-0.96.orig/yaps.rc yaps-0.96/yaps.rc
---- yaps-0.96.orig/yaps.rc	1997-06-11 20:39:06.000000000 +0300
-+++ yaps-0.96/yaps.rc	2005-10-15 10:34:40.313095952 +0300
+--- 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
diff --git a/app-mobilephone/yaps/metadata.xml b/app-mobilephone/yaps/metadata.xml
index 9c5ebcb79a00..7d1862a3ffec 100644
--- a/app-mobilephone/yaps/metadata.xml
+++ b/app-mobilephone/yaps/metadata.xml
@@ -2,5 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mobile-phone</herd>
-	<longdescription>Yet Another Pager Software (optional with CAPI support)</longdescription>
+	<maintainer>
+		<email>sbriesen@gentoo.org</email>
+		<name>Stefan Briesenick</name>
+	</maintainer>
+	<longdescription lang="en">
+		Yet Another Pager Software (optional with CAPI support).
+	</longdescription>
 </pkgmetadata>
diff --git a/app-mobilephone/yaps/yaps-0.96-r1.ebuild b/app-mobilephone/yaps/yaps-0.96-r1.ebuild
index 6a9fed80eaae..96827c226654 100644
--- a/app-mobilephone/yaps/yaps-0.96-r1.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.1 2005/10/15 07:57:30 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.2 2005/10/16 13:48:06 sbriesen Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="capi? ( mirror://sourceforge/capi4yaps/${P}.c2.tgz )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="capi lua slang unicode"
 
 RDEPEND="capi? ( net-dialup/capi4k-utils )
@@ -24,15 +24,15 @@ use capi && S="${S}.c2"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
 	# apply patches
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	use capi \
 		&& grep 2>/dev/null -q CAPI_LIBRARY_V2 /usr/include/capiutils.h \
-		&& epatch ${FILESDIR}/${P}-capiv3.patch
+		&& epatch "${FILESDIR}/${P}-capiv3.patch"
 
 	# if specified, convert all relevant files from latin1 to UTF-8
-	cd ${S}
 	if use unicode; then
 		for i in yaps.doc; do
 			einfo "Converting '${i}' to UTF-8"
@@ -45,7 +45,7 @@ src_compile() {
 	local myconf=""
 	use lua && myconf="${myconf} LUA=True"
 	use slang && myconf="${myconf} SLANG=True"
-	emake CFLAGS="$CFLAGS" ${myconf} || die "emake failed"
+	emake CFLAGS="${CFLAGS}" ${myconf} || die "emake failed"
 }
 
 src_install() {