Fix compilation problems with newer openssl.

(Portage version: 2.1.6.13/git/Linux x86_64)
 (Signed Manifest commit)

7 files changed, 80 insertions, 49 deletions

diff --git a/net-nds/gq/ChangeLog b/net-nds/gq/ChangeLog
new file mode 100644
index 00000000..5218902b
--- /dev/null
+++ b/net-nds/gq/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for net-nds/gq
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  06 Dec 2009; Hans de Graaff <graaff@gentoo.org> -gq-1.2.3.ebuild,
+  gq-1.3.4.ebuild, +files/gq-1.3.4-autoconf.patch,
+  +files/gq-1.3.4-crypto.patch:
+  Fix compilation with newer version of openssl which no longer includes
+  -lcrypto by default. Fix autoconf incompatibility. Update USE flag
+  name for gnome keyring support.
+
diff --git a/net-nds/gq/Manifest b/net-nds/gq/Manifest
index 69ff2024..009cd251 100644
--- a/net-nds/gq/Manifest
+++ b/net-nds/gq/Manifest
@@ -1,4 +1,16 @@
-DIST gq-1.2.3.tar.gz 423119 RMD160 4e8bf1700f4d7aacd906559e01a11654f6ce0f90 SHA1 dc11f4c1c05037786ca6b212f4945fc20ecd33a4 SHA256 f27bd461afd226f410d42a287b7d529ce834353e101d6f88e13f51ea55c582bd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gq-1.3.4-autoconf.patch 482 RMD160 1c6f844373fe7d761f8fe7b10bf85a4ceb8c781f SHA1 a167fda6d4621c92927ca6285d1c20957071fd74 SHA256 b4ab935035af27e30a43dc1a034a567d2e656ab346c44dd3705b779a7f7cbdab
+AUX gq-1.3.4-crypto.patch 348 RMD160 3816446fac5e0d1425ae4c855d1585352cfabae7 SHA1 c092dc7853a691f4f2f1071ebd9eb122cdfd29d9 SHA256 1d23070aafe4a6e75bca77b56c25013aa94a94e30fad74bb673b08d34508cdec
 DIST gq-1.3.4.tar.gz 557801 RMD160 5c8f99f8d1af263252699ea6f84b1bcefa503d07 SHA1 c124260cdf9856bde4d02e3fc567be24b79f8663 SHA256 2ac77f3233ddaef718f89c9371ab5165af29cf9738ed46b6bea64b37e45d4b60
-EBUILD gq-1.2.3.ebuild 983 RMD160 c61e5c565969b4a68aac36153aae07a543775ba6 SHA1 3d09acf9a7e429b356d9b39fb045dca7007222ba SHA256 6ce6c1c05d3db7873240260f646831c6051a7575732941ce2487dbe596270670
-EBUILD gq-1.3.4.ebuild 1153 RMD160 7ee9b74f5e8ae361f12d1929261d8a93c94d1048 SHA1 9b1b83f64d581324e80280b61d2f5e1d21e17f6b SHA256 f12bdc76c0d2347f76f15bacf92718fc69aa66559de787c65d8e458196155924
+EBUILD gq-1.3.4.ebuild 1303 RMD160 e13abaed33b26d0a04e7e1d799927b18e631aa39 SHA1 359ff16b3d8f9d9bc8bcefb3f1756648f2c414a8 SHA256 87cca973f12402bc58f046353bda4f83002eef5bfa62df22439fa1f011e48de5
+MISC ChangeLog 439 RMD160 9871f5a644e49c5e5ae898b61eeb76ba33ca29f7 SHA1 d54e2dc42854258d1b4a5c2cb21429da60d673c5 SHA256 e09b50324c9b3188cd45ac0b0bc99b6fef3717236ab30009fad2d912280473ab
+MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksbozcACgkQVYU2Ai8K93dAcACeOI1Ebe5QKkCV7fYLoOqu9mQZ
+kAgAnilds+kSrTmpXEDdzsyIKcF/zIIq
+=2VjG
+-----END PGP SIGNATURE-----
diff --git a/net-nds/gq/files/gq-1.3.4-autoconf.patch b/net-nds/gq/files/gq-1.3.4-autoconf.patch
new file mode 100644
index 00000000..8ac5bb8b
--- /dev/null
+++ b/net-nds/gq/files/gq-1.3.4-autoconf.patch
@@ -0,0 +1,20 @@
+--- configure.in.~1~	2009-12-06 13:10:44.686445772 +0100
++++ configure.in	2009-12-06 13:18:21.866196635 +0100
+@@ -2,7 +2,6 @@
+ 
+ AC_INIT(src/gq.c)
+ AM_INIT_AUTOMAKE(gq, 1.3.4)
+-AM_ACLOCAL_INCLUDE(macros)
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
+--- Makefile.am.~1~	2008-01-09 17:35:11.000000000 +0100
++++ Makefile.am	2009-12-06 13:18:44.353967108 +0100
+@@ -1,5 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
++ACLOCAL_AMFLAGS = -I macros
++
+ SUBDIRS=\
+ 	data \
+ 	icons \
diff --git a/net-nds/gq/files/gq-1.3.4-crypto.patch b/net-nds/gq/files/gq-1.3.4-crypto.patch
new file mode 100644
index 00000000..fab7eae7
--- /dev/null
+++ b/net-nds/gq/files/gq-1.3.4-crypto.patch
@@ -0,0 +1,12 @@
+--- configure.in.~1~	2008-02-12 17:23:05.000000000 +0100
++++ configure.in	2009-12-01 19:58:56.066711244 +0100
+@@ -255,6 +255,9 @@
+ 	AC_CHECK_LIB(ssl, SSL_new,
+ 		     [LIBS="-lssl $LIBS"]
+ 	)
++	AC_CHECK_LIB(crypto, BIO_new,
++	         [LIBS="-lcrypto $LIBS"]
++    )
+ fi
+ 
+ AC_CHECK_FUNCS(ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \
diff --git a/net-nds/gq/gq-1.2.3.ebuild b/net-nds/gq/gq-1.2.3.ebuild
deleted file mode 100644
index 7cde1028..00000000
--- a/net-nds/gq/gq-1.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="A GTK+-based LDAP client"
-HOMEPAGE="http://www.gq-project.org/"
-SRC_URI="mirror://sourceforge/gqclient/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=net-nds/openldap-2
-	kerberos? ( virtual/krb5 )
-	dev-libs/openssl
-	dev-libs/libxml2
-	>=dev-libs/glib-2.6
-	x11-libs/pango
-	dev-libs/cyrus-sasl
-	>=gnome-base/gnome-keyring-0.4.4
-	>=gnome-base/libglade-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	local myconf="--enable-browser-dnd --enable-cache --disable-update-mimedb"
-	use kerberos && myconf="${myconf} --with-kerberos-prefix=/usr"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	rm -f "${D}"/usr/share/locale/locale.alias
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-}
diff --git a/net-nds/gq/gq-1.3.4.ebuild b/net-nds/gq/gq-1.3.4.ebuild
index 452dca9e..4e217c48 100644
--- a/net-nds/gq/gq-1.3.4.ebuild
+++ b/net-nds/gq/gq-1.3.4.ebuild
@@ -1,9 +1,13 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
+inherit autotools
+
 DESCRIPTION="A GTK+-based LDAP client"
-HOMEPAGE="http://www.gq-project.org/"
+HOMEPAGE="http://sourceforge.net/projects/gqclient/"
 SRC_URI="mirror://sourceforge/gqclient/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -12,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 
 # More use flags are needed because now there are a number of
 # automagic dependencies.
-IUSE="kerberos keyring"
+IUSE="kerberos gnome-keyring"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 	>=net-nds/openldap-2
@@ -22,18 +26,24 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=dev-libs/glib-2.6
 	x11-libs/pango
 	dev-libs/cyrus-sasl
-	keyring? ( >=gnome-base/gnome-keyring-0.4.4 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.4 )
 	>=gnome-base/libglade-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}-crypto.patch"
+	epatch "${FILESDIR}/${P}-autoconf.patch"
+
+	eautoreconf
+}
+
+src_configure() {
 	local myconf="--enable-browser-dnd --enable-cache --disable-update-mimedb"
 	use kerberos && myconf="${myconf} --with-kerberos-prefix=/usr"
-	use keyring && myconf="${myconf} --with-keyring-api=gnome"
+	use gnome-keyring && myconf="${myconf} --with-keyring-api=gnome"
 
 	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/net-nds/gq/metadata.xml b/net-nds/gq/metadata.xml
new file mode 100644
index 00000000..f9772993
--- /dev/null
+++ b/net-nds/gq/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>graaff@gentoo.org</email></maintainer>
+</pkgmetadata>