summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/dlib/ChangeLog10
-rw-r--r--sci-libs/dlib/Manifest12
-rw-r--r--sci-libs/dlib/dlib-17.49.ebuild (renamed from sci-libs/dlib/dlib-17.47.ebuild)22
3 files changed, 27 insertions, 17 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/Manifest b/sci-libs/dlib/Manifest
index a2856e00a641..ac359a74a190 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -2,16 +2,16 @@
Hash: SHA256
AUX dlib-17.48-makefile-test.patch 1013 SHA256 cf45d4f77525aa33342710705c5fc4024229042768d076b6ca7729c1173683fe SHA512 a1f608db8c630f82ed8839e49c4346117fb554cef680b40549a007fc8587ef576deb3ce2f79274f98a8557e94d4c61fdda6884d1a8e4661e8dfa779f812aceed WHIRLPOOL b3e11e1f0ed1d56dead0dabe19365f99d96fdfb378e5b9e7e09380fd18a0cecb256a4c938099dd11baaae17d6b2028c5eb2697ca37cac02343b2b07bff6f4727
-DIST dlib-17.47.tar.bz2 2696029 SHA256 57f43bb283ae2f0586610b0b56f939a58c27fd7d0df48f59d6ce657e10e4c253 SHA512 eb07796b5a84f5ac58b7b843f36edb8142c604d0173cd3003ead9284620c444d6d5a92351a7d02406491f10be32914b4a9f4300cf766e6d3c3f9a3854fe78055 WHIRLPOOL 76a0ca99c7f1bf838799b07b5e4763d29b590d23111b1bf742314820c3b8122d29139a8754b25b22dae0f0763b51437d65d46cf818857fcb50f9220e23695ad9
DIST dlib-17.48.tar.bz2 2732903 SHA256 cb415053a592a9e4a4358ee3352dea2001ba699e9dd1b6e089f935d1953c0ddb SHA512 786d90cd6c291dbc34331b035b2bbd861e2c3c2e438c3eb81091ba3600b034fb7c59b84a37c17c57e527d1a5db72e8f26ead60f6dbe0c89a56746846ba0dc1f4 WHIRLPOOL d046b7381aa3c26c9a1c7aeee07a464e0400d0ec39f098d8755a62e6816e33e1e49cf4738383ea43596a55d01bb84b5d82fcea8ca8d9d52a7156a0b205b2da5c
-EBUILD dlib-17.47.ebuild 966 SHA256 fc11d4e77ba64777cdf3fdbf75729c679012b169add84fe2655eeb3f7115efd1 SHA512 0d1a4a6e5280a889a2e2b9e62ede416c0029dd55f9fdb4d75fc3e9d9560237ebfa4efcfbbd7e1ffc04a0ad796c689383a3fb3cc922f1870688fef5507f063771 WHIRLPOOL 75105253ad4fe60cb32c676ef316721726d08b5d970f1970936713d8350b25296e9df4a3394ab76e370c3d0840a65b721f2629acae9845d0115b7b4196d91366
+DIST dlib-17.49.tar.bz2 2820202 SHA256 3b60ae79e7f0ea0860bc2b3ce09fba9a117dfecf87ec6573ca582f46d9bcb506 SHA512 558d8dd86f20675b8a65f0f2bd978480cd71772028e25851653dd7e08e90ab49908f1dcd8d47369e0ad2eeb5f505c09d0bb626b2f51afc6ac0a8892a9e0b162c WHIRLPOOL 1bb16f6d7b63d4c0d090f12b116b1f8972cc181dd0f8e40faa76e925de02c407bfb292053ca2829bb9771ee097bf7ab6c71f1ac721aa47240479098b6ce175da
EBUILD dlib-17.48.ebuild 1088 SHA256 cb67e165e051b94f674a92a24a583ac2d321604e78ca7b5b04cc55651e2dc8f0 SHA512 44d665b3136b19e3172e7765aa3a41c0f44e63bb2f594206742512e11463dff901aaf086ca9d88591aaf0bfcc03ef443709ea1f46a1603f36b371b4bcbd7199c WHIRLPOOL 0f0c993719b3a8df27d07cbf1b6590e36e2d4fc2457c9a9543013e33932fdd986ed3760e067c86a2fd37e201bf1905a4e4730f5c1095cd3675442f92b966f17b
-MISC ChangeLog 694 SHA256 4715a20145dd167e1c072e45b534ba41695c162e57f917cc0f5df5534ec577aa SHA512 39bfff8c9460fe1d730124dcd34c81b66f84cbe3815b4ebd5755818b54a69cd078d22affc47238767343943601bd8e2a2d5c4828bb3ad36283567850543c6bd3 WHIRLPOOL 04bf27347fb94ca0cc75078c9a7b17067592465554bcf2c163cc81dd14b7b31752fb6485d15692496938ddc09ffd0885da9721f1a421b38f2e400854cd0d47d0
+EBUILD dlib-17.49.ebuild 1095 SHA256 abe51b0c684e7eaaf5e1daa83b2d44b4dc743322bb969292acc323a230b46fc7 SHA512 8b87d68bccfeb52c8f0ee0c03506f28ea420a5e4e6a26f55e36f763f478ea78e963043ee75551f59d57f296c872bc4edf35952037b827eb4d64ba36d4badf7b8 WHIRLPOOL f665e6d0d7d7925584194e5c323f2203c732ca80fc9eb8c4f0e7fb51c12301e72d7f562da1cd16b76dd4e9bfcc3b23de3ce2a7b2c1a9ec05694eba5182d1be2b
+MISC ChangeLog 834 SHA256 81e2a80aafe63b5d8e225f01a49347eef7e30df31f0733cfa1d2d8273c131eb9 SHA512 d783bcaf618d0bfad6c36854c6fe5f2b7e7b872e1790bebbc7010d04c254033f9a69b3680331428850ec4e1269b249d16ceb1d8efb52763862eae132048189ba WHIRLPOOL e5218b34603d968aeccb375ca3e43d7af54cbebc513fa9a4d38995254b8e6b902106522828cacf3ba85b0aae6819b3d598fa2515dcd9f9b790c045b1d612f91d
MISC metadata.xml 464 SHA256 1a4da5ef4e777fd52db22e7e2b01b2c4cf13be449e22f833373f09c3688a8d90 SHA512 55def7692c3d74337a354cac20f4f5585569f9d9772d07f835331c56659b211d8ef7d211f352c496e7805bbb10ff6a4d4298658f126859719409107b883d4239 WHIRLPOOL eb86f46f5e5f7368b7c66be4e408ba5417245aa47fb6c8f15bc3b56bebb9fd0e3abd3c3e23ec365b0f3b1f9da76ae84a32d372b8c9bb3373e2a14f954cd0d64e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDGeggACgkQ1ycZbhPLE2DKbgCeKs4sZW1akEOQ+TIchSSAOB98
-EesAoKBJepHbwxELzlv2GwMHPdFOYYQ/
-=ST0o
+iEYEAREIAAYFAlD1kx0ACgkQ1ycZbhPLE2ANDwCdGfzMhMSUhUIfY6uJmVtx2U7h
+wyUAnRIJB/5j5IE9yhAsxPeQiB9QmyYQ
+=aOLM
-----END PGP SIGNATURE-----
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/*