aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/dcmtk/ChangeLog6
-rw-r--r--sci-libs/dcmtk/Manifest16
-rw-r--r--sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild50
-rw-r--r--sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild9
4 files changed, 44 insertions, 37 deletions
diff --git a/sci-libs/dcmtk/ChangeLog b/sci-libs/dcmtk/ChangeLog
index fca501ba3..cf6b2c7ef 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/Manifest b/sci-libs/dcmtk/Manifest
index b24b01365..70ce8ed56 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX dcmtk-asneeded.patch 3572 RMD160 301bf1f03e308d8b467cbf7e164bbb9bc09520f1 SHA1 d64cf9c0e7096a8367f7b6fec8f795a8d9a8c907 SHA256 42ff1b257fea580807487075764b765292268ea5bb353427c4f5c14e1a862dfe
DIST dcmtk-3.5.4.tar.gz 3756374 RMD160 d1558c9c68e53e0ea3b080fd2fb50b9d8e30eeba SHA1 169056874947083e68eb941fcd53faaebc862ae5 SHA256 7b8575ba609516d76b681c0de8c1328cf23e57deb2c7085a6aa37d4292354d76
DIST dcmtk-3.5.5_20101008.tar.gz 4662578 RMD160 ccda8393aa1d27745832ed74635ef545f1fedab2 SHA1 29539987c042fd9c75f7628f49a03c49aecf5876 SHA256 f8eb25c76e078a387f86cd09ee27687f9860a1e9072b321ac8e070ccb85b1d90
DIST dcmtk_3.5.4-3.diff.gz 140253 RMD160 c06856a46513612c3a585bc3fea429d296ae6bb4 SHA1 75c14b8c6caa88155324b5bb8ed29363776ff7bf SHA256 8dd3ca447de4b0f1d553f672f36d5d88af86763604e2fc830667ce6fdd12677a
-EBUILD dcmtk-3.5.4-r3.ebuild 1651 RMD160 69aed5ef15c82adf2c8ac87372c40bdf1f538c05 SHA1 cfb7780f1181c82821f62c4ff5b1392cd31b5b41 SHA256 cb150ebed2924b0975bed42fcf2a65f1a0a077627f612937e3fe79135f4d3cce
-EBUILD dcmtk-3.5.5_pre20101008.ebuild 1864 RMD160 252734ce2e03e27ce2a5058223953483874f21b9 SHA1 f1cde09f81e228a835399b73c28954d14ff69b61 SHA256 1815d45057a67e298c97f4589f14d0e0708fcf5464a5f7a054a37761669acbab
-MISC ChangeLog 854 RMD160 49b09edeaf36c78b6511d5851d0ed6b5031048dd SHA1 1183fdacb246c03864f7ecae48aca5e09aae6204 SHA256 21e5435b725d4596124f6331dc8702ec23c402d8e5b7f9b0c54d178f68b812c0
+EBUILD dcmtk-3.5.4-r3.ebuild 1560 RMD160 f850c23a2f4bc04821e7665a2aeb55aa22150fcf SHA1 62055e4a292ebdebcd9462d776db9e95a6b13941 SHA256 9fa33e6e66dbc24a64dff2c6e2735479b4f1d44a7c61117903aba490b6680536
+EBUILD dcmtk-3.5.5_pre20101008.ebuild 1867 RMD160 4e2eaa0901059b4906b00dec60cb4806fa5418b5 SHA1 4d7d3b463382b73d54027c7c0bd53d699b798a34 SHA256 3611e83435242de1fe91731b8b4dca412ffc8e93711697d23622b7428f170f95
+MISC ChangeLog 1006 RMD160 f4e6fd915c9082e6c03999518c5c520c13fcb629 SHA1 e0e7730ad8a3fa27419373d19397f351f01d5eca SHA256 5edaa2c053ca9390a809f8f434b828ad591c2aaac6934371df34ff2f15c3c5d5
MISC metadata.xml 938 RMD160 e6451a136c100b3cafe90e2e1064dffb77aca7d9 SHA1 1a3b698c05897246eb73666f205ec7d873d20270 SHA256 3541a8cb00af24c3b785d021e1d15a94d9c0883d43a60228dd81ab7898534925
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk10v4EACgkQgAnW8HDreRZGCwCcCdqXjL5tfBFNBufg0r5930EA
+LNIAnicjlmHM7d421UQM7YVeIQI7wQJC
+=fiz4
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild b/sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild
index b25c86f59..cfa22d4ba 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 29f4dd960..8e9c98ab7 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 )"