Version bump. Tests respect user settings

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 62 insertions, 16 deletions

diff --git a/sci-libs/dlib/ChangeLog b/sci-libs/dlib/ChangeLog
index 64588037294f..58e03e203e78 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.2 2012/08/02 22:16:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/ChangeLog,v 1.3 2012/12/11 00:09:49 bicatali Exp $
+
+*dlib-17.48 (11 Dec 2012)
+
+  11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +dlib-17.48.ebuild,
+  +files/dlib-17.48-makefile-test.patch, -dlib-17.46.ebuild:
+  Version bump. Tests respect user settings
 
 *dlib-17.47 (02 Aug 2012)
 
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index d0ec6e2fdc13..a2856e00a641 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST dlib-17.46.tar.bz2 2578378 SHA256 5996d40ff77d98f388a7d4955bf3e4ec2c061842294d044bbb5fc20c84d27c34
+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
-EBUILD dlib-17.46.ebuild 933 SHA256 15d3f365b6dbb18a9b20d4a4a1debdb7aa67ab49582e8f00e9d3a92c540c7659 SHA512 da1ad40bcef885747cf64648a4af49afb09845774b27a31fe6456fe347837d07ed342a359f83e3d7f56de073a42510149c7ce006501906f3a394a252a45fc5c5 WHIRLPOOL 4569d47e3e59f1df7a1f8845ec3874e43d1b6cf687d9bac0265fb7223bfa494c6ea5204abfeb4cc8a046e82d5e7e7878c9ce7f6646d3fac5ad38771da50bc053
+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
-MISC ChangeLog 486 SHA256 a4a919a4ba95a2b3645a1fca05a4350e9657f9f4936acfabcb73683bb26c89be SHA512 9e7219c690f15a6041ceaca3fd93953570d9b1a22d81c00c19b308b5685ec9fce5a30e530bf0938b306d5d43a110553b099d69a4e723e4007c1dfc411f4ae1a0 WHIRLPOOL 411660b0356c8684776d9f54208c109914f7c6b29cdc7b1c23c169a3115ad39c5dc885f4b2d40457bc858894421c444de64ba564850deed873d9df08bbcfa7bb
+EBUILD dlib-17.48.ebuild 1088 SHA256 cb67e165e051b94f674a92a24a583ac2d321604e78ca7b5b04cc55651e2dc8f0 SHA512 44d665b3136b19e3172e7765aa3a41c0f44e63bb2f594206742512e11463dff901aaf086ca9d88591aaf0bfcc03ef443709ea1f46a1603f36b371b4bcbd7199c WHIRLPOOL 0f0c993719b3a8df27d07cbf1b6590e36e2d4fc2457c9a9543013e33932fdd986ed3760e067c86a2fd37e201bf1905a4e4730f5c1095cd3675442f92b966f17b
+MISC ChangeLog 694 SHA256 4715a20145dd167e1c072e45b534ba41695c162e57f917cc0f5df5534ec577aa SHA512 39bfff8c9460fe1d730124dcd34c81b66f84cbe3815b4ebd5755818b54a69cd078d22affc47238767343943601bd8e2a2d5c4828bb3ad36283567850543c6bd3 WHIRLPOOL 04bf27347fb94ca0cc75078c9a7b17067592465554bcf2c163cc81dd14b7b31752fb6485d15692496938ddc09ffd0885da9721f1a421b38f2e400854cd0d47d0
 MISC metadata.xml 464 SHA256 1a4da5ef4e777fd52db22e7e2b01b2c4cf13be449e22f833373f09c3688a8d90 SHA512 55def7692c3d74337a354cac20f4f5585569f9d9772d07f835331c56659b211d8ef7d211f352c496e7805bbb10ff6a4d4298658f126859719409107b883d4239 WHIRLPOOL eb86f46f5e5f7368b7c66be4e408ba5417245aa47fb6c8f15bc3b56bebb9fd0e3abd3c3e23ec365b0f3b1f9da76ae84a32d372b8c9bb3373e2a14f954cd0d64e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAa/EwACgkQ1ycZbhPLE2DOZgCeKV28gZnWDsazsTFz5sZ0xtDY
-FX0AniWPPGvWpNewER6MHSLnUtlhy5p0
-=RKCW
+iEYEAREIAAYFAlDGeggACgkQ1ycZbhPLE2DKbgCeKs4sZW1akEOQ+TIchSSAOB98
+EesAoKBJepHbwxELzlv2GwMHPdFOYYQ/
+=ST0o
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/dlib/dlib-17.46.ebuild b/sci-libs/dlib/dlib-17.48.ebuild
index 2eb1ac69c395..80a24515bf58 100644
--- a/sci-libs/dlib/dlib-17.46.ebuild
+++ b/sci-libs/dlib/dlib-17.48.ebuild
@@ -1,37 +1,41 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-17.46.ebuild,v 1.1 2012/06/07 19:55:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-17.48.ebuild,v 1.1 2012/12/11 00:09:49 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"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="blas doc examples jpeg lapack png X"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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}"/${P}-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
+	rm -r dlib/{README,LICENSE}.txt dlib/test || die
 	insinto /usr/include
 	doins -r dlib
 	use doc && dohtml docs/*
diff --git a/sci-libs/dlib/files/dlib-17.48-makefile-test.patch b/sci-libs/dlib/files/dlib-17.48-makefile-test.patch
new file mode 100644
index 000000000000..81aed4431954
--- /dev/null
+++ b/sci-libs/dlib/files/dlib-17.48-makefile-test.patch
@@ -0,0 +1,35 @@
+--- dlib/test/makefile.orig	2012-12-10 23:56:00.000000000 +0000
++++ dlib/test/makefile	2012-12-10 23:59:07.000000000 +0000
+@@ -5,14 +5,15 @@
+ TARGET = test 
+ 
+ # these are the compile time flags passed to gcc
+-CFLAGS = -ggdb  -DDEBUG -DDLIB_NO_GUI_SUPPORT  -I ../..  -Wall
++CPPFLAGS :=    -DDEBUG -DDLIB_NO_GUI_SUPPORT -I../..
++CXXFLAGS := -ggdb -Wall
+ 
+ # These are the link time flags passed to gcc
+ LFLAGS = -lpthread   -lnsl 
+ 
+ # The name of the compiler.  If you only have one version of
+ # gcc installed then you probably want to change this to just g++ 
+-CC = nice g++
++CXX := nice g++
+ 
+ ####################################################
+ ####################################################
+@@ -146,13 +147,9 @@
+ 
+ $(TARGET): $(OBJ) 
+ 	@echo Linking $@
+-	@$(CC) $(OBJ) $(LFLAGS) -o $@
++	@$(CXX) $(LDFLAGS) $(OBJ) $(LFLAGS) -o $@
+ 	@echo Build Complete
+ 
+-.cpp.o: $<
+-	@echo Compiling $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
+-
+ clean:
+ 	@rm -f $(OBJ) $(TARGET)
+ 	@echo All object files and binaries removed