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

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

commit:     fa41faec07678ca0f515e525b15f95d4b1fecfb8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 11:20:33 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 11:20:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fa41faec

Correct Slots for gtk 3 introduction to tree

(Portage version: 2.2.0_alpha26/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-libs/dcmtk/ChangeLog                      |    6 ++-
 sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild          |   50 ++++++++++--------------
 sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild |    9 ++--
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/sci-libs/dcmtk/ChangeLog b/sci-libs/dcmtk/ChangeLog
index fca501b..cf6b2c7 100644
--- a/sci-libs/dcmtk/ChangeLog
+++ b/sci-libs/dcmtk/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/dcmtk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Mar 2011; Justin Lecher <jlec@gentoo.org> dcmtk-3.5.4-r3.ebuild,
+  dcmtk-3.5.5_pre20101008.ebuild:
+  Correct Slots for gtk 3 introduction to tree
+
 *dcmtk-3.5.5_pre20101008 (25 Oct 2010)
 
   25 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>

diff --git a/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild b/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
index b25c86f..cfa22d4 100644
--- a/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
@@ -1,46 +1,39 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="3"
+
 inherit eutils
 
 DESCRIPTION="Libraries and applications implementing large parts the DICOM standard"
 HOMEPAGE="http://dicom.offis.de/dcmtk.php.en"
 DEB_PV=3 # Debian patch dcmtk_3.5.4-3.diff
 SRC_URI="
-ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/${P}.tar.gz
-mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PV}.diff.gz
-"
+	ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PV}.diff.gz"
 
-# ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/COPYRIGHT
 LICENSE="BSD"
 KEYWORDS="~x86"
 SLOT="0"
 IUSE="png ssl tcpd tiff xml zlib doc"
 
 RDEPEND="
-media-libs/jpeg
-png? ( media-libs/libpng )
-ssl? ( dev-libs/openssl )
-tcpd? ( sys-apps/tcp-wrappers )
-tiff? ( media-libs/tiff )
-xml? ( dev-libs/libxml2 )
-zlib? ( sys-libs/zlib )
-"
-DEPEND="
-doc? ( app-doc/doxygen )
-${RDEPEND}
-"
-
-src_unpack() {
+	virtual/jpeg
+	png? ( media-libs/libpng )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
 
-	unpack ${A}
+src_prepare() {
 	epatch "${PN}_3.5.4-3.diff"
-
 }
 
-src_compile() {
-
+src_configure() {
 	econf \
 		--sysconfdir=/etc/dcmtk \
 		--with-private-tags \
@@ -49,18 +42,18 @@ src_compile() {
 		$(use_with png libpng) \
 		$(use_with xml libxml) \
 		$(use_with tcpd libwrap) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
+		$(use_with ssl openssl)
+}
+
+src_compile() {
 	# Don't compile without ARCH="" ?!
 	emake ARCH="" || die "emake failed"
 	if use doc; then
 		emake html
 	fi
-
 }
 
 src_install() {
-
 	if use doc; then
 		emake DESTDIR="${D}" install-all \
 			install-doc \
@@ -71,9 +64,8 @@ src_install() {
 			install-lib \
 			|| die "emake install failed"
 	fi
-	dodoc COPYRIGHT FAQ HISTORY *.txt
+	dodoc FAQ HISTORY *.txt
 	if use doc; then
 		dohtml "${PN}"/html/*
 	fi
-
 }

diff --git a/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild b/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild
index 29f4dd9..8e9c98a 100644
--- a/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI="3"
 
 inherit cmake-utils eutils
 
@@ -17,12 +17,13 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc png ssl tcpd tiff +threads xml zlib"
 
-RDEPEND="media-libs/jpeg
+RDEPEND="
+	virtual/jpeg
 	png? ( media-libs/libpng )
 	ssl? ( dev-libs/openssl )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tiff? ( media-libs/tiff )
-	xml? ( dev-libs/libxml2 )
+	xml? ( dev-libs/libxml2:2 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"