Use upstream versioning and fix build with Linux 3.x (bug #383803 by Diego Elio Pettenò).

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 49 insertions, 19 deletions

diff --git a/app-forensics/memdump/ChangeLog b/app-forensics/memdump/ChangeLog
index be059a6ce4ba..736d033b2e21 100644
--- a/app-forensics/memdump/ChangeLog
+++ b/app-forensics/memdump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/memdump
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/ChangeLog,v 1.9 2011/06/26 07:17:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/ChangeLog,v 1.10 2011/09/27 08:52:16 radhermit Exp $
+
+*memdump-1.01 (27 Sep 2011)
+
+  27 Sep 2011; Tim Harder <radhermit@gentoo.org> -memdump-1.0.1.ebuild,
+  +memdump-1.01.ebuild, +files/memdump-1.01-linux3.patch:
+  Use upstream versioning and fix build with Linux 3.x (bug #383803 by Diego
+  Elio Pettenò).
 
   26 Jun 2011; Tim Harder <radhermit@gentoo.org> memdump-1.0.1.ebuild:
   Respect LDFLAGS (bug #337739), respect CC (bug #243594), don't test FEATURES
diff --git a/app-forensics/memdump/Manifest b/app-forensics/memdump/Manifest
index 3dcdcae6aba7..aef37c8a53a1 100644
--- a/app-forensics/memdump/Manifest
+++ b/app-forensics/memdump/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX memdump-1.01-linux3.patch 651 RMD160 3ca30bbe0128690d435878ac3b93ffdb2aea37a8 SHA1 1183de87bd4d05f56badc1aea91b6da0be9e8a5a SHA256 8a98257ebfd24774ae1fd0fb507f607cf5461baa39c8ca291bb23f334919d793
 DIST memdump-1.0.tar.gz 12669 RMD160 d36e7db9adf7f6362d4236bb9a6c7ec19a3566cc SHA1 a826742d1c3a59c275279065dc86d20f083984e1 SHA256 1b6704bb290c3658b7460a388a9a570e38fe5be5d9498840a44df23b3591f3e8
 DIST memdump-1.01.tar.gz 12713 RMD160 437585744012de5c6f88743c05428ca9bc9cf9b1 SHA1 bc5f0a132f41a3606697e874e942e6588398a3a8 SHA256 76de8ff167d0779d6c3b2f2f52ca9d1cc22af179c51e976fe6e3b9a5d1e5799f
-EBUILD memdump-1.0.1.ebuild 999 RMD160 44849d7e25ca087606474c9e34b5a0f7526b8e8d SHA1 de7beef6431f008c91dc27e1bb260d1e63860a7e SHA256 3081ed1188e8ee42f57cde2f320d0e6f3b0102236e1ab0825f869ade5ca23e1c
 EBUILD memdump-1.0.ebuild 883 RMD160 c669ee2d9caa2da3bb893d6b12da4fa77393a89e SHA1 7d9f46c8988a1137ac7f0ad3f9b0a50d2717c6c8 SHA256 688cbf7d0332a792049601d7539780925e02bfff94157f91dab1adbf39b429b8
-MISC ChangeLog 1312 RMD160 11853c0439d530c1aade08fac52a3d2f2f22b521 SHA1 c07621a3dacb3563a071899d56710b36a4bde7c5 SHA256 f3542d74a00ad7d94463ea1d594af4aea273f997e36ba05a1a9f4cf7da483dfb
+EBUILD memdump-1.01.ebuild 994 RMD160 770b329082017e8a5af69b8380b8530e730549b3 SHA1 eb3f7e36ce97f92b35d27f1f7d2de6e2bcf5d9bd SHA256 f4f4be4c1dc7281b6bd74ab05bc85c4d5da01e0e5d855040e47f18bac616f1c8
+MISC ChangeLog 1568 RMD160 92616f2acbb71ae282a5059ae5a290a4a5373045 SHA1 86781c913d6c4f18b64e4ce7ca7b9a6918e45d0b SHA256 f7995067cdd4d819db69da711dfda4a7a72b4625c69c6cd2788c3e1a514913b1
 MISC metadata.xml 230 RMD160 bae79bd47dd753f27518cf7f9da71328ff1e005b SHA1 d88c6d49a90025a7ecb8f501bba12aaefbbbf589 SHA256 54d210721f07e0e12229fe8d2a4f394ffa1432d52e9e0af50a5dd4f2f763d387
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOBtz5AAoJEEqz6FtPBkyj8/gH/iTiBKOVdULnrqpjBcy83igU
-Lum+rvUxvthZmVR5cKp2Rqe5c78qb9zIPHoh6RHaQk+AQbhngoyEOky5/qslBYB0
-bnl47sF9NQ88tZBdYIknkgu/SaQw2A15+QGpzNppKUXO7vi7s/sc6r+dDO2zHErm
-2Hq/71jegQ3YnSQ8DeC1iLooAcCTQozhEUi0AiwlCaPYjhcq/klEb6D4KUBdDbgK
-xHhyQ0XKora8aeQKS9GfYLxEWbvXcO5HXTLHlTfE+JauRbg00b2R49g/frl3LqWH
-D5+YWDPUZnZkCZx6q4gDIeg+rNt/tfReITOZKnyFD6cSiizsRtDRHNFF17Shrw4=
-=Wmpx
+iQEcBAEBCgAGBQJOgY7KAAoJEEqz6FtPBkyjG7gH/3ce/+y4/To241hGIiFfNJCU
+bPcZZ0GwmG0H40p6QrLOgt3tnRRWnTupq3D8WfwmugJLyCMJ4tO+h13f3lO6Lr0P
+TOnnOIlTOWuhbBxCoEDd5T0Xu1SGOaVcAQoEHAM9lN1gnTlaR8upkM9ZNBAu61/U
+yprw/sW8r2jkc0Dx6BtQI2JUmW9w9KZ0WXZiDKaf3q0vURaXjUpzOViFSI2a+qqp
+bWVvbsX6oSTgkb8dMrzYSvsN5Lc04AjV91nqTx58NDCPYGLKAmNSUv/xqIruZefu
+O7zgQxHwmZX+XcIC7PpSe9oobHPxdnhVwjWx/aOngxRaauc47C+CiglJuOgcmhk=
+=pmE3
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/memdump/files/memdump-1.01-linux3.patch b/app-forensics/memdump/files/memdump-1.01-linux3.patch
new file mode 100644
index 000000000000..55563c4e077a
--- /dev/null
+++ b/app-forensics/memdump/files/memdump-1.01-linux3.patch
@@ -0,0 +1,24 @@
+--- memdump-1.01.orig/makedefs
++++ memdump-1.01/makedefs
+@@ -30,9 +30,7 @@
+     SunOS.5*)	DEFS="-DSUNOS5 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ 		RANLIB=":"
+ 		;;
+-  Linux.2.4*)   DEFS="-DLINUX2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+-		;;
+-    Linux.2*)   DEFS="-DLINUX2"
++    Linux.*)   DEFS="-DLINUX -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ 		;;
+            *)   echo unsupported system: $SYSTEM.$RELEASE 1>&2; exit 1
+ 		;;
+--- memdump-1.01.orig/memdump.c
++++ memdump-1.01/memdump.c
+@@ -118,7 +118,7 @@
+ #define SUPPORTED
+ #endif
+ 
+-#ifdef LINUX2
++#ifdef LINUX
+ #include <paths.h>
+ #define GETPAGESIZE getpagesize
+ #define SUPPORTED
diff --git a/app-forensics/memdump/memdump-1.0.1.ebuild b/app-forensics/memdump/memdump-1.01.ebuild
index 4e61e4d207c6..c94c34fe3ab9 100644
--- a/app-forensics/memdump/memdump-1.0.1.ebuild
+++ b/app-forensics/memdump/memdump-1.01.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/memdump-1.0.1.ebuild,v 1.4 2011/06/26 07:17:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/memdump-1.01.ebuild,v 1.1 2011/09/27 08:52:16 radhermit Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Simple memory dumper for UNIX-Like systems"
 HOMEPAGE="http://www.porcupine.org/forensics"
-SRC_URI="http://www.porcupine.org/forensics/${PN}-1.01.tar.gz"
+SRC_URI="http://www.porcupine.org/forensics/${P}.tar.gz"
+
 LICENSE="IBM"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-DEPEND=""
-RDEPEND=""
 IUSE=""
 
-S=${WORKDIR}/${PN}-1.01
-
 src_prepare() {
 	sed -i -e 's:$(CFLAGS):\0 $(LDFLAGS):' Makefile || die
+	epatch "${FILESDIR}"/${P}-linux3.patch
 }
 
 src_compile() {