* [gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/
@ 2011-03-07 12:01 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2011-03-07 12:01 UTC (permalink / raw
To: gentoo-commits
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 )"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/
@ 2011-06-24 17:09 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
To: gentoo-commits
commit: c9fc2099229d3b5a1d5f1ac2713f5798f693005d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 15:01:03 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 15:01:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c9fc2099
Sort inherit and/or USE
(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild | 2 +-
sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild b/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
index cfa22d4..3e9bf07 100644
--- a/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
KEYWORDS="~x86"
SLOT="0"
-IUSE="png ssl tcpd tiff xml zlib doc"
+IUSE="doc png ssl tcpd tiff xml zlib"
RDEPEND="
virtual/jpeg
diff --git a/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild b/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild
index 8e9c98a..85c20d3 100644
--- a/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild
@@ -15,7 +15,7 @@ LICENSE="BSD"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="doc png ssl tcpd tiff +threads xml zlib"
+IUSE="doc png ssl tcpd +threads tiff xml zlib"
RDEPEND="
virtual/jpeg
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/
@ 2014-11-13 11:10 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2014-11-13 11:10 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/
@ 2015-03-10 14:54 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-03-10 14:54 UTC (permalink / raw
To: gentoo-commits
commit: de9a17c1d2d9661964ab04359727a0ecae78e76b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 14:54:08 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 14:54:08 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=de9a17c1
sci-libs/dcmtk: Fix compilation with USE=-doc, fixes https://github.com/gentoo-science/sci/issues/385
Package-Manager: portage-2.2.18
sci-libs/dcmtk/ChangeLog | 6 +++++-
sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sci-libs/dcmtk/ChangeLog b/sci-libs/dcmtk/ChangeLog
index 3177dd5..869f1ff 100644
--- a/sci-libs/dcmtk/ChangeLog
+++ b/sci-libs/dcmtk/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/dcmtk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Mar 2015; Justin Lecher <jlec@gentoo.org> dcmtk-3.6.0.ebuild:
+ sci-libs/dcmtk: Fix compilation with USE=-doc, fixes https://github.com
+ /gentoo-science/sci/issues/385
+
13 Nov 2014; Justin Lecher <jlec@gentoo.org> dcmtk-3.6.0.ebuild,
metadata.xml:
Move large patch into patch dir
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index 67d2bb8..b78553d 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -19,7 +19,7 @@ SLOT="0"
IUSE="doc png ssl tcpd +threads tiff xml zlib"
RDEPEND="
- virtual/jpeg
+ virtual/jpeg:0=
png? ( media-libs/libpng:0= )
ssl? ( dev-libs/openssl:= )
tcpd? ( sys-apps/tcp-wrappers )
@@ -71,5 +71,5 @@ src_configure() {
}
src_compile() {
- cmake-utils_src_compile all $(usex doc "html")
+ cmake-utils_src_compile all $(usex doc "html" "")
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-10 14:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-10 14:54 [gentoo-commits] proj/sci:master commit in: sci-libs/dcmtk/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2014-11-13 11:10 Justin Lecher
2011-06-24 17:09 Justin Lecher
2011-03-07 12:01 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox