Touchup -w example usage #69660.

Package-Manager: portage-2.0.51-r15

4 files changed, 32 insertions, 14 deletions

diff --git a/sys-apps/dog/ChangeLog b/sys-apps/dog/ChangeLog
index 7c4539407da4..83443ea4f580 100644
--- a/sys-apps/dog/ChangeLog
+++ b/sys-apps/dog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dog
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.9 2004/09/03 21:03:23 pvdabeel Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.10 2005/02/11 05:36:39 vapier Exp $
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.7-manpage-touchup.patch, dog-1.7.ebuild:
+  Touchup -w example usage #69660.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> dog-1.7.ebuild:
   Masked dog-1.7.ebuild stable for ppc
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index 04fe1a14ef8a..97a4d1bf1b14 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -1,4 +1,5 @@
-MD5 1b5450183910669864b7d0e604a40027 ChangeLog 1078
-MD5 d41777e0fff36fab30f2a8492b33d2b9 dog-1.7.ebuild 697
+MD5 bc86344e5a69cddf5f2b2e42cbf5e3d3 ChangeLog 1215
+MD5 8a5838fdfc978d8897bc8fd905a6d243 dog-1.7.ebuild 694
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7 58
+MD5 39566b62f641a9ca7555f7bbea2878d9 files/1.7-manpage-touchup.patch 498
diff --git a/sys-apps/dog/dog-1.7.ebuild b/sys-apps/dog/dog-1.7.ebuild
index ec5be7dbe365..d58adb8d868d 100644
--- a/sys-apps/dog/dog-1.7.ebuild
+++ b/sys-apps/dog/dog-1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7.ebuild,v 1.14 2004/10/28 15:55:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7.ebuild,v 1.15 2005/02/11 05:36:39 vapier Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Dog is better than cat"
 HOMEPAGE="http://jl.photodex.com/dog/"
@@ -13,21 +13,16 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 ppc-macos sparc x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4"
-
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
 	sed -i \
 		-e 's/^CFLAGS/#CFLAGS/' \
 		-e "s/gcc/$(tc-getCC)/" \
 		Makefile
 }
 
-src_compile() {
-	emake || die
-}
-
 src_install() {
 	dobin dog || die
 	doman dog.1
diff --git a/sys-apps/dog/files/1.7-manpage-touchup.patch b/sys-apps/dog/files/1.7-manpage-touchup.patch
new file mode 100644
index 000000000000..324c82696705
--- /dev/null
+++ b/sys-apps/dog/files/1.7-manpage-touchup.patch
@@ -0,0 +1,18 @@
+The correct syntax of the -w option does not have a space between 
+the -w and the cols ... the manpage seems to imply differently though 
+so let's fix it.
+
+http://bugs.gentoo.org/show_bug.cgi?id=69660
+
+--- dog.1
++++ dog.1
+@@ -8,3 +8,3 @@
+ .B dog
+-[\-AbBeEnstTuv] [\-w cols] [\-l lines] 
++[\-AbBeEnstTuv] [\-w<cols>] [\-l lines] 
+ [\-\-show\-all] [\-\-number\-nonblank] [\-\-no\-blanks] [\-\-bind=port]
+@@ -64,3 +64,3 @@
+ .TP
+-.I \-w n
++.I \-w<n>
+ Print first n characters of each line (default=80)