Fix compilation, bug #398617 by Marcin Kowalski.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 58 insertions, 15 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index 486b5923046c..edc38b3d720e 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/analog
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.68 2011/07/15 15:25:21 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.69 2012/03/04 10:27:52 pacho Exp $
+
+  04 Mar 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/analog-6.0-undefined-macro.patch, analog-6.0-r4.ebuild:
+  Fix compilation, bug #398617 by Marcin Kowalski.
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> -analog-6.0-r3.ebuild,
   analog-6.0-r4.ebuild:
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 43c25db053d9..6fdb654a37b6 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX analog-5.1-gentoo.diff 799 RMD160 b28d553ffd5ffffacf3d8ae15aac1edcbc41c90c SHA1 ebc18f5cb362385aa2c884fe568a44365f417308 SHA256 4d748bf259f372578306a16b04c8442ddfa22f5f867c281758abc589c09e1b14
 AUX analog-6.0-bzip2.patch 3260 RMD160 1728c4edac24bd09b938b86ceb42e151357c0878 SHA1 4873efd3b33a544f6d16c2d04292b9e408344bf2 SHA256 c71786544305d0ec1d469a621b3ae75889828af210d2d19a7a984d4a4c1faf6b
+AUX analog-6.0-undefined-macro.patch 997 RMD160 134ef6d5c17d3ca2d073e9bfe9f30bde49365cbf SHA1 eab362826fba3d4eb319aa2b0de3e1995e13cf4d SHA256 0304bdfb273fabc3004ae3227f34c7dcedf8f170434f08b97d333785e5ef9d65
 AUX analog.cfg 3992 RMD160 60c87408dd4300011108e7efa1a7267a6104ad98 SHA1 1151ea868ceafdf37e2225deb88b8e88b7784e1d SHA256 83742dc17e28297fe4a4844bc53ef397ad1bb0514ed98b79ad5a9857f3a61fa8
 DIST analog-6.0.tar.gz 1553316 RMD160 75c6157d2ac1459ee28a90001787382f5b671dca SHA1 17ad601f84e73c940883fb9b9e805879aac37493 SHA256 31c0e2bedd0968f9d4657db233b20427d8c497be98194daf19d6f859d7f6fcca
-EBUILD analog-6.0-r4.ebuild 1365 RMD160 9ba727d4a2a12949f2705a44dc13b94cecd31a5a SHA1 de6de094a4254390707918d674c6dc277a7d25a5 SHA256 9bca83ad7c979d94e3f414144d92521225a5cdef8c172e44e55e0c75d719e68f
-MISC ChangeLog 8119 RMD160 16ad13d3a8132d08086493bdfd72739bc434779d SHA1 f109b7c7340f43c953326cc145a43d08dad19d5b SHA256 d8659fde94f6362fde0d9b241ff3b47075af46ba8cb8d9dd697e3a363999d8b3
+EBUILD analog-6.0-r4.ebuild 1368 RMD160 786ba429ea6ca619fd58358def5fd27142f5685c SHA1 070e815a10f5d30d6eeabfc869f124eb3a6a7498 SHA256 061005709644a95253a2ce285a39c291d86dbe1d404c86e6e5d46df375ca4212
+MISC ChangeLog 8277 RMD160 17c228b8ccf4b7acb6be82a48e7d36a58e70f3d2 SHA1 40a25c40b3ad07e13104c237d6a98c4d11bde54b SHA256 262071065bca08f8d46bbf38ce561b59e9a1bb66dac57a6650e2c8c54b1ae874
 MISC metadata.xml 292 RMD160 354d84d97415a69afafccaae6cd627760a95475f SHA1 6266efbae4646d6658dacb480b8f3a78e5c4735f SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk589RcACgkQfXuS5UK5QB3URgQAj6IVQYDkACaCn/2R5XNMMzB/
-+XtgrgOQoct8vxB+bKR2cJYKxdIKmA1uIH3PjVS5NhUzp5FIwL37IBvnKKfFIoqq
-gPpRTPuhkZeHT9kwzuFldKjhj+7Ivq/OjLdtXR+7THzpVz4Ho/AvkfPKt5nqEYzY
-LSz3UpaIrIWX+6Ddts4=
-=QiWX
+iEYEARECAAYFAk9TQ64ACgkQCaWpQKGI+9QZWgCfarhoe53ioOAmCAXP+Bw/YbIy
+XG8AnigA1HlZUCl30UT3mqrDYuWS2Q9Y
+=z7h6
 -----END PGP SIGNATURE-----
diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
index b23ce0ef7d57..75567e07d727 100644
--- a/app-admin/analog/analog-6.0-r4.ebuild
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.9 2011/07/15 15:25:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.10 2012/03/04 10:27:52 pacho Exp $
 
 EAPI=4
 
@@ -24,6 +24,8 @@ src_prepare() {
 	cd src/
 	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
 	epatch "${FILESDIR}/${P}-bzip2.patch"
+	epatch "${FILESDIR}/${P}-undefined-macro.patch"
+
 	sed -i Makefile \
 		-e 's| -o | $(LDFLAGS)&|g' \
 		|| die "sed Makefile"
@@ -33,11 +35,11 @@ src_compile() {
 	tc-export CC
 	# emake in main dir just executes "cd src && make",
 	# i.e. MAKEOPTS are ignored
-	emake -C src || die "make failed"
+	emake -C src
 }
 
 src_install() {
-	dobin analog || die "dobin failed"
+	dobin analog
 	newman analog.man analog.1
 
 	dodoc README.txt Licence.txt analog.cfg
diff --git a/app-admin/analog/files/analog-6.0-undefined-macro.patch b/app-admin/analog/files/analog-6.0-undefined-macro.patch
new file mode 100644
index 000000000000..5a98541c465c
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-undefined-macro.patch
@@ -0,0 +1,38 @@
+--- a/src/unzip/ioapi.h	2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/ioapi.h	2012-01-11 18:07:59.570768250 +0100
+@@ -35,6 +35,16 @@
+ extern "C" {
+ #endif
+ 
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+ typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+--- a/src/unzip/unzip.h 2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/unzip.h 2012-01-11 18:00:25.988120225 +0100
+@@ -47,6 +47,15 @@
+ extern "C" {
+ #endif
+ 
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
+ #ifndef _ZLIB_H
+ #include "../zlib/zlib.h"
+ #endif
+