[gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/

["Justin Lecher" <jlec@gentoo.org>]

commit:     82709001d9d49ae32818d94f27c265400d143ae7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 13 11:10:28 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 11:10:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=82709001

sci-libs/dcmtk: Move large patch into patch dir

Package-Manager: portage-2.2.14

---
 sci-libs/dcmtk/ChangeLog          |  4 ++++
 sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 11 +++++++----
 sci-libs/dcmtk/metadata.xml       |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sci-libs/dcmtk/ChangeLog b/sci-libs/dcmtk/ChangeLog
index c277bcc..3177dd5 100644
--- a/sci-libs/dcmtk/ChangeLog
+++ b/sci-libs/dcmtk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2014; Justin Lecher <jlec@gentoo.org> dcmtk-3.6.0.ebuild,
+  metadata.xml:
+  Move large patch into patch dir
+
 *dcmtk-3.6.0 (09 Apr 2014)
 
   09 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> -dcmtk-3.5.4-r3.ebuild,

diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index dd47c24..67d2bb8 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -8,9 +8,12 @@ inherit cmake-utils
 
 DESCRIPTION="OFFIS DICOM image files library and tools"
 HOMEPAGE="http://dicom.offis.de/dcmtk.php.en"
-SRC_URI="http://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
-LICENSE="BSD"
+SRC_URI="
+	http://dicom.offis.de/download/dcmtk/release/${P}.tar.gz
+	https://raw.githubusercontent.com/gentoo-science/sci/master/patches/07_doxygen.patch
+	"
 
+LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc png ssl tcpd +threads tiff xml zlib"
@@ -29,7 +32,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-asneeded.patch
 	"${FILESDIR}"/02_dcmtk_3.6.0-1.patch
-	"${FILESDIR}"/07_doxygen.patch
+	"${DISTDIR}"/07_doxygen.patch
 	"${FILESDIR}"/prefs.patch
 	"${FILESDIR}"/dcmtk_version_number.patch
 	"${FILESDIR}"/regression_stacksequenceisodd.patch
@@ -68,5 +71,5 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile all $(use doc && echo html)
+	cmake-utils_src_compile all $(usex doc "html")
 }

diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml
index d49a1d2..09e7a87 100644
--- a/sci-libs/dcmtk/metadata.xml
+++ b/sci-libs/dcmtk/metadata.xml
@@ -1,15 +1,15 @@
 <?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">
   DCMTK is a collection of libraries and applications implementing large
   parts the DICOM standard. It includes software for examining,
   constructing and converting DICOM image files, handling offline media,
   sending and receiving images over a network connection, as well as
   demonstrative image storage and worklist servers.
 </longdescription>
-<longdescription lang="fr">
+  <longdescription lang="fr">
   DCMTK est un ensemble de bibliothèques et d'application implémentant
   une grande partie du standard DICOM. Cela comprend des logiciels de
   visualisation et de conversion des fichier image, de manipulation de