gnutls: bump to 3.4.14 + 3.5.2, drop lib*.la, add TEST(). (#628)

* Bump to 3.4.14 (current stable) and add 3.5.2, marked untested.
* Move $binDir to a _bin sub-package, for more flexibility with
  regards to package co-installation. 3.4.x and 3.5.x seem to be
  causing problems for other recipes, so this layout change, with
  some other changes (e.g. package basename renames) can help.
* Update the layout of 2.8.x.
* Change the basename of the recipe of 3.4.x to gnutls34.
* Use gnutls35 as basename for the recipe of 3.5.x.
* Declare CONFLICTS, CONFLICTS_{bin,devel} in a way that allows
  gnutls-2.8.x to be installed with either gnutls-3.4.x or
  gnutls-3.5.x. On top of that, a single _bin package may be
  installed (provided the base package is also installed.) Same
  thing for _devel.
* Add cmd:cvs cmd:git to BUILD_PREREQUIRES in order to make
  gl/tests/test-vc-list-files-{cvs,git} succeed.
* Patch gl/tests/test-float.c to enable that test.
* Add cmd:{perl,makeinfo} to BUILD_PREREQUIRES.

net-libs/gnutls/gnutls-2.8.6.recipe

@@ -10,21 +10,15 @@ COPYRIGHT="2009-2010 Free Software Fundation Inc.
 	2004-2008 Simon Josefsson
 	2000-2004 Nikos Mavrogiannopoulos"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
-SOURCE_URI="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.6.tar.bz2"
+REVISION="2"
+SOURCE_URI="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-$portVersion.tar.bz2"
 CHECKSUM_SHA256="d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356"
-PATCHES="gnutls-2.8.6.patch"
+PATCHES="gnutls-$portVersion.patch"
 
 ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
 	gnutls = $portVersion
-	cmd:certtool
-	cmd:gnutls_cli
-	cmd:gnutls_cli_debug
-	cmd:gnutls_serv
-	cmd:psktool
-	cmd:srptool
 	lib:libgnutls_extra = 26.14.12 compat = 26
 	lib:libgnutls_openssl = 26.14.12 compat = 26
 	lib:libgnutls = 26.14.12 compat = 26
@@ -36,6 +30,22 @@ REQUIRES="
 	lib:libgpg_error
 	"
 
+PROVIDES_bin="
+	gnutls_bin = $portVersion
+	cmd:certtool
+	cmd:gnutls_cli
+	cmd:gnutls_cli_debug
+	cmd:gnutls_serv
+	cmd:psktool
+	cmd:srptool
+	"
+REQUIRES_bin="
+	gnutls == $portVersion base
+	haiku
+	lib:libgcrypt
+	lib:libgpg_error
+	"
+
 PROVIDES_devel="
 	gnutls_devel = $portVersion
 	devel:libgnutls_extra = 26.14.12 compat = 26
@@ -45,6 +55,8 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	gnutls == $portVersion base
+	devel:libgcrypt
+	devel:libgpg_error
 	"
 
 BUILD_REQUIRES="
@@ -63,7 +75,7 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	libtoolize --force --copy --install
-    cd lib
+	cd lib
 		libtoolize --force --copy --install
 	cd ..
 	cd libextra
@@ -78,10 +90,23 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libgnutls-extra libgnutls-openssl libgnutls libgnutlsxx
+	rm -f $libDir/lib*.la
+
+	prepareInstalledDevelLibs \
+		libgnutls-extra \
+		libgnutls-openssl \
+		libgnutls \
+		libgnutlsxx
+
 	fixPkgconfig
 
-	packageEntries devel $developDir
+	packageEntries devel \
+		$developDir \
+		$manDir/man3
+
+	packageEntries bin \
+		$binDir \
+		$documentationDir
 }
 
 TEST()