From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PwZ9x-0004rR-Ih for garchives@archives.gentoo.org; Mon, 07 Mar 2011 12:03:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9EE9E07BA; Mon, 7 Mar 2011 12:01:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A68E0E07BA for ; Mon, 7 Mar 2011 12:01:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 225921B4052 for ; Mon, 7 Mar 2011 12:01:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7EB5F80074 for ; Mon, 7 Mar 2011 12:01:35 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/dcmtk/ChangeLog sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild X-VCS-Directories: sci-libs/dcmtk/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: fa41faec07678ca0f515e525b15f95d4b1fecfb8 Date: Mon, 7 Mar 2011 12:01:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: cd98c22d2bb19706e6134547ceb62522 commit: fa41faec07678ca0f515e525b15f95d4b1fecfb8 Author: Justin Lecher gentoo org> AuthorDate: Mon Mar 7 11:20:33 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Mar 7 11:20:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dfa41faec 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: $ =20 + 07 Mar 2011; Justin Lecher 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) =20 25 Oct 2010; Kacper Kowalik 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: $ =20 +EAPI=3D"3" + inherit eutils =20 DESCRIPTION=3D"Libraries and applications implementing large parts the D= ICOM standard" HOMEPAGE=3D"http://dicom.offis.de/dcmtk.php.en" DEB_PV=3D3 # Debian patch dcmtk_3.5.4-3.diff SRC_URI=3D" -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.g= z + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PV}.diff.gz= " =20 -# ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/COPYRIGHT LICENSE=3D"BSD" KEYWORDS=3D"~x86" SLOT=3D"0" IUSE=3D"png ssl tcpd tiff xml zlib doc" =20 RDEPEND=3D" -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=3D" -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=3D"${RDEPEND} + doc? ( app-doc/doxygen )" =20 - unpack ${A} +src_prepare() { epatch "${PN}_3.5.4-3.diff" - } =20 -src_compile() { - +src_configure() { econf \ --sysconfdir=3D/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=3D"" ?! emake ARCH=3D"" || die "emake failed" if use doc; then emake html fi - } =20 src_install() { - if use doc; then emake DESTDIR=3D"${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/dcm= tk/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: $ =20 -EAPI=3D2 +EAPI=3D"3" =20 inherit cmake-utils eutils =20 @@ -17,12 +17,13 @@ KEYWORDS=3D"~amd64 ~x86" SLOT=3D"0" IUSE=3D"doc png ssl tcpd tiff +threads xml zlib" =20 -RDEPEND=3D"media-libs/jpeg +RDEPEND=3D" + 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=3D"${RDEPEND} doc? ( app-doc/doxygen )"