64 bit fixes, thanks to flameeyes for the patch. Bug #93549.

(Portage version: 2.0.51.22-r1 screaming llama edition)

4 files changed, 72 insertions, 13 deletions

diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index a52f0a369be0..cbb9014fadfc 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8a5838fdfc978d8897bc8fd905a6d243 dog-1.7.ebuild 694
-MD5 224f96a6351e4c5c64db83857c58d6be dog-1.7-r1.ebuild 768
 MD5 5be589fe97817051c65cf582ef01e71a ChangeLog 1642
+MD5 8a5838fdfc978d8897bc8fd905a6d243 dog-1.7.ebuild 694
 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
+MD5 224f96a6351e4c5c64db83857c58d6be dog-1.7-r1.ebuild 768
+MD5 cab968084b993140dfbb2b9900fd19ce dog-1.7-r2.ebuild 821
 MD5 39566b62f641a9ca7555f7bbea2878d9 files/1.7-manpage-touchup.patch 498
-MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7-r1 58
 MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7 58
+MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7-r1 58
 MD5 4af367da579347ba9b87e42418a0c3fd files/dog-1.7-check-ctime.diff 1409
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFChKH2EZCkKN40op4RAjVqAKC6uTyfZZBGhWbSojOoSPURvQwDQACfWcNN
-KQGEHd7DNdhjqwIH0Z/zlAA=
-=Hg2X
------END PGP SIGNATURE-----
+MD5 c53d189c92688fe749f4f4376d4727e7 files/dog-1.7-64bit-goodness.patch 791
+MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7-r2 58
diff --git a/sys-apps/dog/dog-1.7-r2.ebuild b/sys-apps/dog/dog-1.7-r2.ebuild
new file mode 100644
index 000000000000..a7d1a4106288
--- /dev/null
+++ b/sys-apps/dog/dog-1.7-r2.ebuild
@@ -0,0 +1,32 @@
+# 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-r2.ebuild,v 1.1 2005/05/23 09:01:51 ciaranm Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dog is better than cat"
+HOMEPAGE="http://jl.photodex.com/dog/"
+SRC_URI="http://jl.photodex.com/dog/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-check-ctime.diff
+	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
+	epatch ${FILESDIR}/${P}-64bit-goodness.patch
+	sed -i \
+		-e 's/^CFLAGS/#CFLAGS/' \
+		-e "s/gcc/$(tc-getCC)/" \
+		Makefile || die "sed Makefile failed"
+}
+
+src_install() {
+	dobin dog || die
+	doman dog.1
+	dodoc README AUTHORS
+}
diff --git a/sys-apps/dog/files/digest-dog-1.7-r2 b/sys-apps/dog/files/digest-dog-1.7-r2
new file mode 100644
index 000000000000..0ab07c34f37b
--- /dev/null
+++ b/sys-apps/dog/files/digest-dog-1.7-r2
@@ -0,0 +1 @@
+MD5 9dd1e04efb7f8535a632bac2eef60a10 dog-1.7.tar.gz 30433
diff --git a/sys-apps/dog/files/dog-1.7-64bit-goodness.patch b/sys-apps/dog/files/dog-1.7-64bit-goodness.patch
new file mode 100644
index 000000000000..9143761852c1
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-64bit-goodness.patch
@@ -0,0 +1,33 @@
+diff -ur dog-1.7/dog.c dog-1.7-64bit/dog.c
+--- dog-1.7/dog.c	2000-06-21 18:04:43.000000000 +0200
++++ dog-1.7-64bit/dog.c	2005-05-23 10:40:58.613766328 +0200
+@@ -38,22 +38,13 @@
+ #include <limits.h>
+ #include <netdb.h>
+ 
+-// this is fun
+-#if defined(__alpha)
+-#define uint16	unsigned short
+-#define int16	short
+-#define uint32	unsigned int
+-#define int32	int
+-#define uint64	unsigned long
+-#define int64	long
+-#else
+-#define uint16	unsigned short
+-#define int16	short
+-#define uint32	unsigned long
+-#define int32	long
+-#define uint64	unsigned long long
+-#define int64	long long
+-#endif
++#define uint16	uint16_t
++#define int16	int16_t
++#define uint32	uint32_t
++#define int32	int32_t
++#define uint64	uint64_t
++#define int64	int64_t
++
+ #if defined(__STDC__)
+ #define __dog_signed		signed
+ #else