Version Bump, bug #549314; drop old

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

4 files changed, 22 insertions, 16 deletions

diff --git a/sci-libs/dlib/ChangeLog b/sci-libs/dlib/ChangeLog
index 050a93c932f2..766e99d3d3e2 100644
--- a/sci-libs/dlib/ChangeLog
+++ b/sci-libs/dlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/dlib
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/ChangeLog,v 1.9 2014/05/21 17:37:41 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/ChangeLog,v 1.10 2015/05/15 11:20:14 jlec Exp $
+
+*dlib-18.15 (15 May 2015)
+
+  15 May 2015; Justin Lecher <jlec@gentoo.org> +dlib-18.15.ebuild,
+  -dlib-18.4.ebuild, dlib-18.7.ebuild, metadata.xml:
+  Version Bump, bug #549314; drop old
 
 *dlib-18.7 (21 May 2014)
 
diff --git a/sci-libs/dlib/dlib-18.4.ebuild b/sci-libs/dlib/dlib-18.15.ebuild
index 5ce388d0fa90..5bcaab5afb3f 100644
--- a/sci-libs/dlib/dlib-18.4.ebuild
+++ b/sci-libs/dlib/dlib-18.15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-18.4.ebuild,v 1.1 2013/09/09 16:56:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-18.15.ebuild,v 1.1 2015/05/15 11:20:14 jlec Exp $
 
 EAPI=5
 
-inherit flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Numerical and networking C++ library"
 HOMEPAGE="http://dlib.net/"
@@ -17,9 +17,9 @@ IUSE="blas doc examples jpeg lapack png test X"
 
 RDEPEND="
 	blas? ( virtual/blas )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0= )
 	lapack? ( virtual/lapack )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0= )
 	X? ( x11-libs/libX11 )"
 DEPEND="test? ( ${RDEPEND} )"
 
@@ -28,9 +28,9 @@ src_prepare() {
 }
 
 src_test() {
-	cd dlib/test
+	cd dlib/test || die
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
-	./test --runall || die
+	./dtest --runall || die
 }
 
 src_install() {
diff --git a/sci-libs/dlib/dlib-18.7.ebuild b/sci-libs/dlib/dlib-18.7.ebuild
index 4a8863a3a6cd..040113c2eb28 100644
--- a/sci-libs/dlib/dlib-18.7.ebuild
+++ b/sci-libs/dlib/dlib-18.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-18.7.ebuild,v 1.1 2014/05/21 17:37:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dlib/dlib-18.7.ebuild,v 1.2 2015/05/15 11:20:14 jlec Exp $
 
 EAPI=5
 
-inherit flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Numerical and networking C++ library"
 HOMEPAGE="http://dlib.net/"
@@ -17,7 +17,7 @@ IUSE="blas doc examples jpeg lapack png test X"
 
 RDEPEND="
 	blas? ( virtual/blas )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0= )
 	lapack? ( virtual/lapack )
 	png? ( media-libs/libpng:0= )
 	X? ( x11-libs/libX11 )"
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_test() {
-	cd dlib/test
+	cd dlib/test || die
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
 	./test --runall || die
 }
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 153bb9ce8254..6c30830cf2cd 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   dlib is a C++ library for developing portable applications dealing with
   networking, threads, graphical interfaces, data structures, linear
   algebra, machine learning, XML and text parsing, numerical