Added several compile fixes from upstream

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 76 insertions, 184 deletions

diff --git a/net-libs/libopkele/ChangeLog b/net-libs/libopkele/ChangeLog
index aba63731bea8..a105c70c40bb 100644
--- a/net-libs/libopkele/ChangeLog
+++ b/net-libs/libopkele/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libopkele
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libopkele/ChangeLog,v 1.8 2012/11/27 19:00:53 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libopkele/ChangeLog,v 1.9 2014/05/26 05:25:48 polynomial-c Exp $
+
+*libopkele-2.0.4-r1 (26 May 2014)
+
+  26 May 2014; Lars Wendler <polynomial-c@gentoo.org> -libopkele-2.0.4.ebuild,
+  +libopkele-2.0.4-r1.ebuild, -files/libopkele-0.3.2-asneeded.patch,
+  +files/libopkele-2.0.4-gcc471.patch,
+  +files/libopkele-2.0.4-missing_includes.patch:
+  non-maintainer commit: Added several compile fixes from upstream.
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -libopkele-0.3.2.ebuild,
   -libopkele-2.0.3.ebuild, metadata.xml:
diff --git a/net-libs/libopkele/files/libopkele-0.3.2-asneeded.patch b/net-libs/libopkele/files/libopkele-0.3.2-asneeded.patch
deleted file mode 100644
index 5829be7f30e8..000000000000
--- a/net-libs/libopkele/files/libopkele-0.3.2-asneeded.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur libopkele-0.3.2.orig/acinclude.d/libcurl.m4 libopkele-0.3.2/acinclude.d/libcurl.m4
---- libopkele-0.3.2.orig/acinclude.d/libcurl.m4	2007-09-28 23:48:00.000000000 +0300
-+++ libopkele-0.3.2/acinclude.d/libcurl.m4	2008-05-19 12:54:11.000000000 +0300
-@@ -1,7 +1,7 @@
- # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
- #                       [ACTION-IF-YES], [ACTION-IF-NO])
- # ----------------------------------------------------------
--#      David Shaw <dshaw@jabberwocky.com>   Jan-23-2005
-+#      David Shaw <dshaw@jabberwocky.com>   May-09-2006
- #
- # Checks for libcurl.  DEFAULT-ACTION is the string yes or no to
- # specify whether to default to --with-libcurl or --without-libcurl.
-@@ -13,10 +13,10 @@
- # ACTION-IF-NO is a list of shell commands that are run otherwise.
- # Note that using --without-libcurl does run ACTION-IF-NO.
- #
--# This macro defines HAVE_LIBCURL if a working libcurl setup is found,
--# and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary values.
--# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the
--# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
-+# This macro #defines HAVE_LIBCURL if a working libcurl setup is
-+# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
-+# values.  Other useful defines are LIBCURL_FEATURE_xxx where xxx are
-+# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
- # where yyy are the various protocols supported by libcurl.  Both xxx
- # and yyy are capitalized.  See the list of AH_TEMPLATEs at the top of
- # the macro for the complete list of possible defines.  Shell
-@@ -32,13 +32,8 @@
- # found is after version 7.7.2, the first version that included the
- # curl-config script.  Note that it is very important for people
- # packaging binary versions of libcurl to include this script!
--# Without curl-config, we can only make educated guesses as to what
--# protocols are available.  Specifically, we assume that all of HTTP,
--# FTP, GOPHER, FILE, TELNET, LDAP, and DICT exist, and (if SSL exists)
--# HTTPS is present.  All of these protocols existed when libcurl was
--# first created in version 7, so this is a safe assumption.  If the
--# version is 7.11.0 or later, FTPS is assumed to be present as well.
--# FTPS existed before then, but was not yet fully standards compliant.
-+# Without curl-config, we can only guess what protocols are available,
-+# or use curl_version_info to figure it out at runtime.
- 
- AC_DEFUN([LIBCURL_CHECK_CONFIG],
- [
-@@ -47,16 +42,19 @@
-   AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
-   AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
-   AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
-+  AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
-+  AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
-+  AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
- 
-   AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
--  AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
-   AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
-+  AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
- 
-   AC_ARG_WITH(libcurl,
-      AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
-@@ -71,12 +69,14 @@
-      _libcurl_try_link=yes
- 
-      if test -d "$_libcurl_with" ; then
--        CPPFLAGS="${CPPFLAGS} -I$withval/include"
--        LDFLAGS="${LDFLAGS} -L$withval/lib"
-+        LIBCURL_CPPFLAGS="-I$withval/include"
-+        _libcurl_ldflags="-L$withval/lib"
-+        AC_PATH_PROG([_libcurl_config],[curl-config],["$withval/bin"],
-+                     ["$withval/bin"])
-+     else
-+	AC_PATH_PROG([_libcurl_config],[curl-config])
-      fi
- 
--     AC_PATH_PROG([_libcurl_config],[curl-config])
--
-      if test x$_libcurl_config != "x" ; then
-         AC_CACHE_CHECK([for the version of libcurl],
- 	   [libcurl_cv_lib_curl_version],
-@@ -103,6 +103,15 @@
-            fi
-            if test x"$LIBCURL" = "x" ; then
-               LIBCURL=`$_libcurl_config --libs`
-+
-+              # This is so silly, but Apple actually has a bug in their
-+	      # curl-config script.  Fixed in Tiger, but there are still
-+	      # lots of Panther installs around.
-+              case "${host}" in
-+                 powerpc-apple-darwin7*)
-+                    LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
-+                 ;;
-+              esac
-            fi
- 
- 	   # All curl-config scripts support --feature
-@@ -123,15 +132,15 @@
- 
-         # we didn't find curl-config, so let's see if the user-supplied
-         # link line (or failing that, "-lcurl") is enough.
--        LIBCURL=${LIBCURL-"-lcurl"}
-+        LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
- 
-         AC_CACHE_CHECK([whether libcurl is usable],
-            [libcurl_cv_lib_curl_usable],
-            [
-            _libcurl_save_cppflags=$CPPFLAGS
--           CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
--           _libcurl_save_ldflags=$LDFLAGS
--           LDFLAGS="$LDFLAGS $LIBCURL"
-+           CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
-+           _libcurl_save_libs=$LIBS
-+           LIBS="$LIBCURL $LIBS"
- 
-            AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
- /* Try and use a few common options to force a failure if we are
-@@ -147,12 +156,30 @@
- ]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
- 
-            CPPFLAGS=$_libcurl_save_cppflags
--           LDFLAGS=$_libcurl_save_ldflags
-+           LIBS=$_libcurl_save_libs
-            unset _libcurl_save_cppflags
--           unset _libcurl_save_ldflags
-+           unset _libcurl_save_libs
-            ])
- 
-         if test $libcurl_cv_lib_curl_usable = yes ; then
-+
-+	   # Does curl_free() exist in this version of libcurl?
-+	   # If not, fake it with free()
-+
-+           _libcurl_save_cppflags=$CPPFLAGS
-+           CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-+           _libcurl_save_libs=$LIBS
-+           LIBS="$LIBS $LIBCURL"
-+
-+           AC_CHECK_FUNC(curl_free,,
-+  	      AC_DEFINE(curl_free,free,
-+		[Define curl_free() as free() if our version of curl lacks curl_free.]))
-+
-+           CPPFLAGS=$_libcurl_save_cppflags
-+           LIBS=$_libcurl_save_libs
-+           unset _libcurl_save_cppflags
-+           unset _libcurl_save_libs
-+
-            AC_DEFINE(HAVE_LIBCURL,1,
-              [Define to 1 if you have a functional curl library.])
-            AC_SUBST(LIBCURL_CPPFLAGS)
-@@ -167,7 +194,7 @@
- 
- 	      # We don't have --protocols, so just assume that all
- 	      # protocols are available
--	      _libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT"
-+	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT"
- 
- 	      if test x$libcurl_feature_SSL = xyes ; then
- 	         _libcurl_protocols="$_libcurl_protocols HTTPS"
-@@ -184,6 +211,9 @@
- 	      AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
- 	      eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
-            done
-+	else
-+	   unset LIBCURL
-+	   unset LIBCURL_CPPFLAGS
-         fi
-      fi
- 
-@@ -195,6 +225,7 @@
-      unset _libcurl_protocol
-      unset _libcurl_protocols
-      unset _libcurl_version
-+     unset _libcurl_ldflags
-   fi
- 
-   if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
diff --git a/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch b/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch
new file mode 100644
index 000000000000..5da095348e15
--- /dev/null
+++ b/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch
@@ -0,0 +1,23 @@
+From 9ff6244998b0d41e71f7cc7351403ad590e990e4 Mon Sep 17 00:00:00 2001
+From: qdii <qdii@reblochon.be>
+Date: Fri, 02 Nov 2012 19:46:03 +0000
+Subject: Fix argument-lookup failure on GCC 4.7.1, causing compilation to crash.
+
+Modified-by: Michael Krelin <hacker@klever.net>
+Signed-off-by: Michael Krelin <hacker@klever.net>
+---
+diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h
+index f2721a6..985eef6 100644
+--- a/include/opkele/discovery.h
++++ b/include/opkele/discovery.h
+@@ -21,7 +21,7 @@ namespace opkele {
+ 		public:
+ 
+ 		    inline _DT& add(long priority,const _DT& d) {
+-			return insert(typename map_type::value_type(priority,d))->second;
++			return this->insert(typename map_type::value_type(priority,d))->second;
+ 		    }
+ 
+ 		    bool has_value(const _DT& d) const {
+--
+cgit v0.9-30-gcd78
diff --git a/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch b/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch
new file mode 100644
index 000000000000..184852749478
--- /dev/null
+++ b/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch
@@ -0,0 +1,31 @@
+From 648ae5dbd90e062f3432f809a846d50d994b86d4 Mon Sep 17 00:00:00 2001
+From: qdii <qdii@reblochon.be>
+Date: Fri, 02 Nov 2012 13:49:03 +0000
+Subject: Function _exit was referenced in the code, but <unistd.h> was not included, causing compilation to fail.
+
+---
+diff --git a/test/idiscover.cc b/test/idiscover.cc
+index 4b1e90c..8a5a3fb 100644
+--- a/test/idiscover.cc
++++ b/test/idiscover.cc
+@@ -2,6 +2,7 @@
+ #include <stdexcept>
+ #include <iterator>
+ #include <algorithm>
++#include <unistd.h>
+ using namespace std;
+ #include <opkele/exception.h>
+ #include <opkele/discovery.h>
+diff --git a/test/test.cc b/test/test.cc
+index 2143ac0..770e0c6 100644
+--- a/test/test.cc
++++ b/test/test.cc
+@@ -1,5 +1,6 @@
+ #include <iostream>
+ #include <stdexcept>
++#include <unistd.h>
+ using namespace std;
+ #include <opkele/exception.h>
+ #include <opkele/util.h>
+--
+cgit v0.9-30-gcd78
diff --git a/net-libs/libopkele/libopkele-2.0.4.ebuild b/net-libs/libopkele/libopkele-2.0.4-r1.ebuild
index 2371b9682b8d..ab7455f5d7d2 100644
--- a/net-libs/libopkele/libopkele-2.0.4.ebuild
+++ b/net-libs/libopkele/libopkele-2.0.4-r1.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libopkele/libopkele-2.0.4.ebuild,v 1.1 2012/10/12 06:49:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libopkele/libopkele-2.0.4-r1.ebuild,v 1.1 2014/05/26 05:25:48 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils
 
 DESCRIPTION="A C++ implementation of an OpenID decentralized identity system"
 HOMEPAGE="http://kin.klever.net/libopkele/"
@@ -18,7 +22,12 @@ RDEPEND="app-text/htmltidy
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc471.patch \
+		"${FILESDIR}"/${P}-missing_includes.patch
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS
 }