QA fixes: soname (closing bug #158373, missing header files, separate tests and library building, remove forced flags for x86.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 132 insertions, 9 deletions

diff --git a/sci-libs/djbfft/ChangeLog b/sci-libs/djbfft/ChangeLog
index ee6c7aaaf45a..6570c790be12 100644
--- a/sci-libs/djbfft/ChangeLog
+++ b/sci-libs/djbfft/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/djbfft
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/ChangeLog,v 1.10 2008/04/06 17:45:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/ChangeLog,v 1.11 2008/10/10 20:27:43 bicatali Exp $
+
+*djbfft-0.76-r1 (10 Oct 2008)
+
+  10 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/djbfft-0.76-headers.patch, files/djbfft-0.76-shared.patch,
+  metadata.xml, +djbfft-0.76-r1.ebuild:
+  QA fixes: soname (closing bug #158373, missing header files, separate
+  tests and library building, remove forced flags for x86.
 
   06 Apr 2008; Benedikt Böhm <hollow@gentoo.org> djbfft-0.76.ebuild:
   fix LICENSE, bug #204327
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index 6b16a615a808..6ae6ce2159a5 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX djbfft-0.76-gcc3.patch 1176 RMD160 8c49fb74f011c329c13dcb7bbe7891d1f3d5a7aa SHA1 5217f7b25d6416619c51810c52f174d44c336e52 SHA256 f6b84b582bdb5846f75bdb0def9695884480c062060eaeddd092e7d106256851
-AUX djbfft-0.76-shared.patch 3691 RMD160 ad857ed52974e121b25873cbe9156abf68213d9e SHA1 63bfdc059c87b70a56aad897d57451e614a6e623 SHA256 f14b2c9986c97404910b6a67b5e3da9957d6243e9d76e857229313f0e3a491ab
+AUX djbfft-0.76-headers.patch 995 RMD160 67d48046060923882a40aab7d8b51962dc0a9c96 SHA1 c5403ccae24f90ba3dbe65b08c8145284691e309 SHA256 783ef6cf4b82af55efc6d038aa0fe2f76c81dcd52393444fa0ca438c9ebee483
+AUX djbfft-0.76-shared.patch 3722 RMD160 a958cf5bf50e41240d5bb59d46da330ed31abbf2 SHA1 9e41f833045be02d8fb951d4df1944b27b50f23a SHA256 bbe7f027a29428265e44d4f966808b4d752c523c340d13d8f037233bc45e6ad1
 DIST djbfft-0.76.tar.gz 80092 RMD160 46de3a7ed5d6ca4b245d02a12d969702e57f7381 SHA1 df9d258a75183c10592d937ee2d2befc01a8a0f6 SHA256 799d929c3631a77ef0e16a2449e4fc11af8540b62359f8733ac2899fca2b394c
+EBUILD djbfft-0.76-r1.ebuild 1936 RMD160 4a54685140a7fd46e739515707564f4fc48c1546 SHA1 85416f9d9d1e1be2abc9df294babf6726567c444 SHA256 8670c4e354ed796ca9ad6d7b939acfc7d2baea3b622bdf29337d4369bcc0dcaa
 EBUILD djbfft-0.76.ebuild 1795 RMD160 758507ee39ed8ad32c50be799872f3e50284be3c SHA1 b635f33d565873d8a4b317f1ad85b376f2779850 SHA256 2986577d37ef85b42fb66d24389bc11b4116d271536484c0ea2e6a2d0f318f95
-MISC ChangeLog 2839 RMD160 d8508b037c6ec9054b490ec5e4548fde5276583b SHA1 2fb365c7d19ff0e8c506eab85ccdff687b09a552 SHA256 eab67efd935d067fda239ea524d47a1b72f8444d9cb2eb92e51b4ce0a59906cb
-MISC metadata.xml 175 RMD160 5f3754ee292086dd228e74d6c8c9cd472e0efd9d SHA1 57aef41bb99efd8a544164a7199ba5a1beff61af SHA256 80a42c113d9f00571ff581635652143b3443d63773c3962624faddee3dc5cec1
+MISC ChangeLog 3167 RMD160 bfb4d0ffb2c34006783a6f12a91c8fb37600a7e1 SHA1 20962709d0e2070e4e46927b3875592b073954c8 SHA256 3f23092aeb3e4277c3480175bcef4d6e6310723461890f62a2e6d1f797be0f79
+MISC metadata.xml 628 RMD160 ca1ccd6951c4a98395e8f739275320727a0f3136 SHA1 d57f886a3f35612e176bf8876af99dd81f68f021 SHA256 d7aa1200cc1fa91800f0196bd6bbf0298f63d6669184e27e311fe075ee14f58c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH+Qw4mPFBzbX68WERAjJvAJ9hbzssgu9J5OTDqS5KAA4LejkKdgCcDzcN
-rVBpQHSecb/s34megkIbVUg=
-=VYmR
+iEYEARECAAYFAkjvussACgkQ1ycZbhPLE2AdqACfWfl8wwIf7QKSO/gEnqfgkXRo
+LAYAmgPh9YcUwiKDcEvsFnxSn4CvL40h
+=sGK9
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/djbfft/djbfft-0.76-r1.ebuild b/sci-libs/djbfft/djbfft-0.76-r1.ebuild
new file mode 100644
index 000000000000..bf8b0b934497
--- /dev/null
+++ b/sci-libs/djbfft/djbfft-0.76-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76-r1.ebuild,v 1.1 2008/10/10 20:27:43 bicatali Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Extremely fast library for floating-point convolution"
+HOMEPAGE="http://cr.yp.to/djbfft.html"
+SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	MY_PV="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
+	MY_D="${D}usr"
+
+	# mask out everything, which is not suggested by the author (RTFM)!
+	ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math"
+	strip-flags
+
+	# why?
+	#MY_CFLAGS="${CFLAGS} -O1 -fomit-frame-pointer"
+	MY_CFLAGS="${CFLAGS}"
+	use x86 && MY_CFLAGS="${CFLAGS} -malign-double"
+
+	LIBPERMS="0755"
+	LIBDJBFFT="libdjbfft.so.${MY_PV}"
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc3.patch"
+	epatch "${FILESDIR}/${P}-shared.patch"
+	epatch "${FILESDIR}/${P}-headers.patch"
+
+	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c
+	echo "$(tc-getCC) $MY_CFLAGS -fPIC -DPIC" > "conf-cc"
+	echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld"
+	echo "${MY_D}" > "conf-home"
+	einfo "conf-cc: $(<conf-cc)"
+}
+
+src_compile() {
+	emake \
+		LIBDJBFFT="${LIBDJBFFT}" \
+		LIBPERMS="${LIBPERMS}" \
+		${LIBDJBFFT} || die "emake failed"
+}
+
+src_test() {
+	for t in accuracy accuracy2 speed; do
+		emake ${t} || die "emake ${t} failed"
+		einfo "Testing ${t}"
+		LD_LIBRARY_PATH=. ./${t} > ${t}.out || die "test ${t} failed"
+	done
+}
+
+src_install() {
+	emake LIBDJBFFT="$LIBDJBFFT" install || die "emake install failed"
+	./install || die "setup failed"
+	dosym "${LIBDJBFFT}" /usr/$(get_libdir)/libdjbfft.so
+	dosym "${LIBDJBFFT}" /usr/$(get_libdir)/libdjbfft.so.${MY_PV%%.*}
+	dodoc CHANGES README TODO VERSION || die
+}
diff --git a/sci-libs/djbfft/files/djbfft-0.76-headers.patch b/sci-libs/djbfft/files/djbfft-0.76-headers.patch
new file mode 100644
index 000000000000..39fb623f10ef
--- /dev/null
+++ b/sci-libs/djbfft/files/djbfft-0.76-headers.patch
@@ -0,0 +1,38 @@
+--- strerr.h.orig	1999-09-30 23:25:58.000000000 +0300
++++ strerr.h		2008-09-13 22:14:09.000000000 +0300
+@@ -1,3 +1,5 @@
++#include <errno.h>
++
+ #ifndef STRERR_H
+ #define STRERR_H
+ 
+--- substdio.h.orig	1999-09-30 23:25:58.000000000 +0300
++++ substdio.h		2008-09-13 22:13:41.000000000 +0300
+@@ -1,3 +1,5 @@
++#include <errno.h>
++
+ #ifndef SUBSTDIO_H
+ #define SUBSTDIO_H
+ 
+--- speed.c.orig	1999-09-30 23:25:58.000000000 +0300
++++ speed.c		2008-09-13 19:16:20.352525481 +0300
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "fftr4.h"
+ #include "fftr8.h"
+ #include "fftc4.h"
+--- accuracy2.c.orig	2008-10-10 20:51:06.000000000 +0100
++++ accuracy2.c	2008-10-10 20:51:55.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+ #include "fftc4.h"
+--- accuracy.c.orig	2008-10-10 21:03:30.000000000 +0100
++++ accuracy.c	2008-10-10 21:03:43.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+ #include "fftc4.h"
diff --git a/sci-libs/djbfft/files/djbfft-0.76-shared.patch b/sci-libs/djbfft/files/djbfft-0.76-shared.patch
index 2caae2d9c9df..53ce9af6b7a2 100644
--- a/sci-libs/djbfft/files/djbfft-0.76-shared.patch
+++ b/sci-libs/djbfft/files/djbfft-0.76-shared.patch
@@ -79,7 +79,7 @@
 +	*) echo '  ranlib "$$main"' ;; \
 +	esac; \
 +	echo 'else'; \
-+	echo '  exec `head -1 conf-ld` -shared -o "$$main" $${1+"$$@"}'; \
++	echo '  exec `head -1 conf-ld` -shared -Wl,-soname,libdjbfft.so.0.7.6 -o "$$main" $${1+"$$@"}'; \
 +	echo 'fi'; \
  	) > makelib
  	chmod 755 makelib
diff --git a/sci-libs/djbfft/metadata.xml b/sci-libs/djbfft/metadata.xml
index 19b00f3baf3b..9e2c1d38f2d6 100644
--- a/sci-libs/djbfft/metadata.xml
+++ b/sci-libs/djbfft/metadata.xml
@@ -3,4 +3,13 @@
 <pkgmetadata>
 <herd>sci</herd>
 <herd>video</herd>
+<longdescription lang="en">
+  D.J. Bernstein Fast Fourier Transform (djbfft) is an extremely 
+  fast library for floating-point convolution. The current version
+  holds most of the speed records for double-precision FFTs on
+  general-purpose computers.
+  djbfft provides power-of-2 complex FFTs, real FFTs at twice the speed,
+  and fast multiplication of complex arrays. Single precision and double
+  precision are equally supported.
+</longdescription>
 </pkgmetadata>