add STANDARD_HELP_VERSION=1 to the code to fix bug #45238

3 files changed, 28 insertions, 22 deletions

diff --git a/games-misc/cowsay/ChangeLog b/games-misc/cowsay/ChangeLog
index 099ed26a30fd..9e02a404bc64 100644
--- a/games-misc/cowsay/ChangeLog
+++ b/games-misc/cowsay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/cowsay
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/ChangeLog,v 1.4 2004/01/08 02:46:23 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/ChangeLog,v 1.5 2004/03/21 01:41:20 mr_bones_ Exp $
+
+  20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> cowsay-3.03.ebuild:
+  add STANDARD_HELP_VERSION=1 to the code to fix bug #45238; stop using the
+  provided install.sh script since it doesn't really make src_install cleaner.
 
   07 Jan 2004; Jon Portnoy <avenj@gentoo.org> cowsay-3.03.ebuild :
   AMD64 keywords.
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index c130bd818125..6266fc483f50 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,4 +1,4 @@
-MD5 5aa92dd2b8d4980a19138a60da7a7a7e ChangeLog 748
-MD5 456327744190e72dee43856417bf0020 cowsay-3.03.ebuild 1095
+MD5 ef21561fae33dec7ff60c0f60f809855 ChangeLog 983
+MD5 20b3afff87352932ab86467f8fa5d150 cowsay-3.03.ebuild 1127
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 2e5e04a0c30b4e7e3dab7781049e7d99 files/digest-cowsay-3.03 62
diff --git a/games-misc/cowsay/cowsay-3.03.ebuild b/games-misc/cowsay/cowsay-3.03.ebuild
index 5ff8604ecc48..2dc4a6946f87 100644
--- a/games-misc/cowsay/cowsay-3.03.ebuild
+++ b/games-misc/cowsay/cowsay-3.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/cowsay-3.03.ebuild,v 1.3 2004/01/08 02:46:23 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/cowsay/cowsay-3.03.ebuild,v 1.4 2004/03/21 01:41:20 mr_bones_ Exp $
 
 DESCRIPTION="configurable talking ASCII cow (and other characters)"
 HOMEPAGE="http://www.nog.net/~tony/warez/cowsay.shtml"
@@ -9,28 +9,30 @@ SRC_URI="http://www.nog.net/~tony/warez/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
 RDEPEND=">=dev-lang/perl-5"
 
-src_install() {
-	./install.sh ${D}/usr || "install problem"
-
-	dodir /usr/share/${P}
-	mv ${D}/usr/share/cows ${D}/usr/share/${P}
-
-	cd ${D}/usr/bin
-	sed	-i "s|${D}/usr/share/cows|/usr/share/${P}/cows|g" cowsay || \
-		die "sed cowsay failed"
-	chmod 755 cowsay
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed	-i \
+		-e '1 c\#!/usr/bin/perl'\
+		-e 's/\$version/\$VERSION/g'\
+		-e "s:%PREFIX%/share/cows:/usr/share/${P}/cows:" \
+		-e '/getopts/ i\$Getopt::Std::STANDARD_HELP_VERSION=1;' cowsay \
+			|| die "sed cowsay failed"
+	sed -i \
+		-e "s|%PREFIX%/share/cows|/usr/share/${P}/cows|" cowsay.1 \
+			|| die "sed cowsay.1 failed"
+}
 
-	# Oh what an ugly hack.  install.sh installs into /usr/man so just
-	# "use that energy" and kill it off after doman is done with it.
-	cd ${D}/usr/man/man1
-	sed -i "s|${D}/usr/share/cows|/usr/share/${P}/cows|g" cowsay.1
+src_install() {
+	dobin cowsay || die "dobin failed"
 	doman cowsay.1
-	cd ${D}/usr/share/man/man1
-	ln -s cowsay.1.gz cowthink.1.gz
-	rm -rf ${D}/usr/man
-
+	dosym cowsay /usr/bin/cowthink
+	dosym cowsay.1.gz /usr/share/man/man1/cowthink.1.gz
+	dodir "/usr/share/${P}"
+	cp -r cows/ "${D}/usr/share/${P}/" || die "cp failed"
 }