summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/dlib/ChangeLog10
-rw-r--r--sci-libs/dlib/dlib-17.49.ebuild (renamed from sci-libs/dlib/dlib-17.47.ebuild)22
2 files changed, 21 insertions, 11 deletions
diff --git a/sci-libs/dlib/ChangeLog b/sci-libs/dlib/ChangeLog
index 58e03e203e78..54a8f5a0587f 100644
--- a/sci-libs/dlib/ChangeLog
+++ b/sci-libs/dlib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/dlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/ChangeLog,v 1.3 2012/12/11 00:09:49 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/ChangeLog,v 1.4 2013/01/15 17:34:07 bicatali Exp $
+
+*dlib-17.49 (15 Jan 2013)
+
+ 15 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> +dlib-17.49.ebuild,
+ -dlib-17.47.ebuild:
+ Version bump
*dlib-17.48 (11 Dec 2012)
diff --git a/sci-libs/dlib/dlib-17.47.ebuild b/sci-libs/dlib/dlib-17.49.ebuild
index c664574f66aa..c5cc1ef634f5 100644
--- a/sci-libs/dlib/dlib-17.47.ebuild
+++ b/sci-libs/dlib/dlib-17.49.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-17.47.ebuild,v 1.1 2012/08/02 22:16:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-17.49.ebuild,v 1.1 2013/01/15 17:34:07 bicatali Exp $
EAPI=4
+inherit flag-o-matic toolchain-funcs
+
DESCRIPTION="Numerical and networking C++ library"
HOMEPAGE="http://dlib.net/"
SRC_URI="mirror://sourceforge/dclib/${P}.tar.bz2"
@@ -11,27 +13,29 @@ SRC_URI="mirror://sourceforge/dclib/${P}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas doc examples jpeg lapack png X"
+IUSE="blas doc examples jpeg lapack png test X"
-RDEPEND="blas? ( virtual/blas )
+RDEPEND="
+ blas? ( virtual/blas )
jpeg? ( virtual/jpeg )
lapack? ( virtual/lapack )
png? ( media-libs/libpng )
X? ( x11-libs/libX11 )"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
+DEPEND="test? ( ${RDEPEND} )"
-S="${WORKDIR}/${P}"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-17.48-makefile-test.patch
+}
src_test() {
cd dlib/test
- emake
+ emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
./test --runall || die
}
src_install() {
dodoc dlib/README.txt
- rm -r dlib/{README,LICENSE}.txt dlib/test || diexs
+ rm -r dlib/{README,LICENSE}.txt dlib/test || die
insinto /usr/include
doins -r dlib
use doc && dohtml docs/*