Optionally depend on media-gfx/graphicsmagick[image], #314369; exchange RDEP xpdf -> mupdf, #401289; drop old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

7 files changed, 46 insertions, 108 deletions

diff --git a/sci-chemistry/xdsi/ChangeLog b/sci-chemistry/xdsi/ChangeLog
index 8d8933774e4d..ef11f4c2e318 100644
--- a/sci-chemistry/xdsi/ChangeLog
+++ b/sci-chemistry/xdsi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/xdsi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdsi/ChangeLog,v 1.3 2010/05/17 15:25:21 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdsi/ChangeLog,v 1.4 2012/01/31 08:30:01 jlec Exp $
+
+*xdsi-0.92-r1 (31 Jan 2012)
+
+  31 Jan 2012; Justin Lecher <jlec@gentoo.org> -files/0.91-gentoo.patch,
+  +xdsi-0.92-r1.ebuild, files/0.92-gentoo.patch, -xdsi-0.91.ebuild,
+  -xdsi-0.92.ebuild, metadata.xml:
+  Optionally depend on media-gfx/graphicsmagick[image], #314369; exchange RDEP
+  xpdf -> mupdf, #401289; drop old
 
 *xdsi-0.92 (17 May 2010)
 
diff --git a/sci-chemistry/xdsi/Manifest b/sci-chemistry/xdsi/Manifest
index b00e2b661ea1..321b50266412 100644
--- a/sci-chemistry/xdsi/Manifest
+++ b/sci-chemistry/xdsi/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX 0.91-gentoo.patch 634 RMD160 bf2c7d7da6049fee4ee415e6a1af6759b03f3ed0 SHA1 01ef2f1e1d335a38017370119648987c8e8c13a8 SHA256 300dd8ae306581adf01f6081ea3fdc68e6864b9e6987d624fb779a91cb615f3c
-AUX 0.92-gentoo.patch 663 RMD160 10bb143cfbb15e64b7fdf971cc4d68d824332279 SHA1 344d0c40ffe4b21cf41836c0629297c7d0659780 SHA256 65b6eb6bd54717c7e90e31a81b15c7c4e1071a0b69de9d867a0990df2770db0a
-DIST xdsi_0.91.tar.gz 682436 RMD160 30331a4197670c39493e1e6849268a1b0aa21705 SHA1 c058abc05bc9e9fa4d3bd497e1ba055fd942c4a5 SHA256 81bb385d2676c597ff0fc764905ec38b2dfa6b81870844159e40520f6e77b5b2
+AUX 0.92-gentoo.patch 734 RMD160 e27ba71ae6565c9004ef573301d467631db4bc9d SHA1 2775035a7f94c0e745b1c30ceca41b9ee0497bde SHA256 48bc6f658f773291dbb6b41a2452106311c9de30891f4256ae37900024ec3f4a
 DIST xdsi_0.92.tar.gz 886028 RMD160 3f79072e5e177b3e11c8b0bcc7e038ffe6fb6b90 SHA1 1b9beeb9bfb24bb0cb989ac91faed87d86f25a29 SHA256 416403f167d26b56965283b407783ea80927ace533df76e330b51ca37c9bb9e4
-EBUILD xdsi-0.91.ebuild 1272 RMD160 5934d62466a998dfdb5db2462e08b9835a8a469c SHA1 77cbe3910629e6cca969b19413e0f2adb5de69b8 SHA256 dd622f0fb6705413ace8045239a7b6516abf7ce86550a16123b16e7e729c9716
-EBUILD xdsi-0.92.ebuild 1265 RMD160 6a8c917d2642da2d057f34e65cbc73b6aa6e48ad SHA1 c8b1cb6a889315f9dc1c16f812d847ea3495bf20 SHA256 1eb7e0e893700a2dbe50845a510f8cae59699d0b32fc4b6c1bce89e1b312e31b
-MISC ChangeLog 498 RMD160 257152dd81d6534fe9784c92802147c97a228d22 SHA1 fe4df9b2459fb4f039920fc2246cbed2837b6d0b SHA256 95c63fff26ee6b285688fbbc4ba2c64809cdf9ec4d043cadc20260aa8a6d4f1d
-MISC metadata.xml 978 RMD160 63790119834f78851cbcf92ccd3ca615af95a889 SHA1 35aad499b8658979f0ed26c1c8253fd001e72996 SHA256 fc9c2aa0c9ef8003ee3c95e37c6c68c0b7364d755c70e1a7b6276aa4baa1efcf
+EBUILD xdsi-0.92-r1.ebuild 1363 RMD160 ff1b34dd36aa870f41b60e7c25e5d22407f60be2 SHA1 90d316c5459d3043bd88a28a47307822ae7620d2 SHA256 d9d5b0aff257282295df3584bb818a94f5cb3ba337193ea4959bccb7cb5bfbf8
+MISC ChangeLog 818 RMD160 031ad50682cf434556fe40c1ad6c7b052bc4163a SHA1 6c9010dc3030afa66b1ce32edd9ebe3088eba456 SHA256 17cac8355f8c8140936a45de8f89da932612247bbb052ee7849e32385776b7de
+MISC metadata.xml 982 RMD160 2c4f8f9a4c300ede2cb26a0e81c61afc5b9118bf SHA1 c6847bd7f1f8bbf390351058ca975f72291fb73a SHA256 6518d98c3a78b289ae1d913494693066ed69c1806ba876d812d8058f92f6d526
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkvxX+YACgkQgAnW8HDreRYgtgCeJNnjSew0LzlbBEocIw5SyX27
-PwIAn32rjTDgBG8u73mLmpXARFrGpl7L
-=Err2
+iEYEAREKAAYFAk8npo8ACgkQgAnW8HDreRawdgCeLwh1spCb5M8SU9T5q2YguPIf
+dSQAoMH4t1I/HmlBsbxdNa7myHvCijrE
+=Kj/J
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/xdsi/files/0.91-gentoo.patch b/sci-chemistry/xdsi/files/0.91-gentoo.patch
deleted file mode 100644
index a21752bf5f68..000000000000
--- a/sci-chemistry/xdsi/files/0.91-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/xdsi b/xdsi
-index 2fcc543..2ce8262 100755
---- a/xdsi
-+++ b/xdsi
-@@ -20,8 +20,8 @@
- ####################################################################
- # These are the only two things you may change#
- 
--set Templates "/mydir/templates"
--set initial "/mydir/SLS-2009"
-+set Templates "GENTOOTEMPLATE"
-+set initial "./"
- 
- 
- ####################################################################
-@@ -122,7 +122,7 @@ return 1
- }
- 
- 
--CheckExecutables "kpdf gnuplot xds_par xdsstat xdsviewer convert pointless ipmosflm VIEW"
-+CheckExecutables "xpdf gnuplot xds_par xdsviewer convert pointless ipmosflm"
- 
- wm resizable . 0 0
- 
diff --git a/sci-chemistry/xdsi/files/0.92-gentoo.patch b/sci-chemistry/xdsi/files/0.92-gentoo.patch
index a7ba308371ec..f4a37ff1838d 100644
--- a/sci-chemistry/xdsi/files/0.92-gentoo.patch
+++ b/sci-chemistry/xdsi/files/0.92-gentoo.patch
@@ -1,5 +1,8 @@
+ xdsi |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
 diff --git a/xdsi b/xdsi
-index cbedee8..e11abc5 100755
+index cbedee8..1037913 100755
 --- a/xdsi
 +++ b/xdsi
 @@ -20,8 +20,8 @@
@@ -18,7 +21,7 @@ index cbedee8..e11abc5 100755
  
  
 -CheckExecutables "kpdf gnuplot xds_par xdsstat xds-viewer-0.6 convert pointless ipmosflm VIEW"
-+CheckExecutables "xpdf gnuplot xds_par xds-viewer convert pointless ipmosflm"
++CheckExecutables "kpdf gnuplot xds_par xds-viewer convert pointless ipmosflm"
  
  #wm resizable . 0 0
  
diff --git a/sci-chemistry/xdsi/metadata.xml b/sci-chemistry/xdsi/metadata.xml
index 42fa47ea8165..976eb8a86959 100644
--- a/sci-chemistry/xdsi/metadata.xml
+++ b/sci-chemistry/xdsi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 XDSi offers you the possibility to process all your datasets in a given directory with minimum effort.
 * You just have to provide it with a resultdirectory and the directory where your frames are stored.
 * All datasets consisting of more than 100 frames within the given directory and all its subdirectories will be processed.
diff --git a/sci-chemistry/xdsi/xdsi-0.91.ebuild b/sci-chemistry/xdsi/xdsi-0.91.ebuild
deleted file mode 100644
index fdd6d406900c..000000000000
--- a/sci-chemistry/xdsi/xdsi-0.91.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdsi/xdsi-0.91.ebuild,v 1.1 2010/02/17 11:34:49 jlec Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="A crude interface for running the XDS"
-HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/Xdsi"
-SRC_URI="ftp://turn14.biologie.uni-konstanz.de/pub/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/mosflm
-	sci-chemistry/xds-bin[smp]
-	sci-chemistry/pointless
-	sci-visualization/xds-viewer
-	sci-visualization/gnuplot
-	media-gfx/imagemagick
-	app-text/xpdf
-	dev-lang/tk"
-# Need to clarified for licensing
-# sci-chemistry/xdsstat-bin
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	sed "s:GENTOOTEMPLATE:${EPREFIX}/usr/share/${PN}/templates:g" -i ${PN} \
-	|| die
-}
-
-src_install() {
-	dobin ${PN} || die
-	insinto /usr/share/${PN}/templates
-	doins templates/{*.INP,bohr*,fortran,pauli,info.png,*.pck,tablesf_xdsi} || die
-	dodoc templates/*.pdf || die
-}
-
-pkg_postinst() {
-	elog "Documentation can be found here:"
-	elog "ftp://turn14.biologie.uni-konstanz.de/pub/xdsi/xdsi_doc_print.pdf"
-}
diff --git a/sci-chemistry/xdsi/xdsi-0.92.ebuild b/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild
index 173f95b918b5..62b532d604c8 100644
--- a/sci-chemistry/xdsi/xdsi-0.92.ebuild
+++ b/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdsi/xdsi-0.92.ebuild,v 1.1 2010/05/17 15:25:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/xdsi/xdsi-0.92-r1.ebuild,v 1.1 2012/01/31 08:30:01 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils
 
 DESCRIPTION="A crude interface for running the XDS"
-HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/Xdsi"
+HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/Xdsi/"
 SRC_URI="ftp://turn5.biologie.uni-konstanz.de/pub/${PN}_${PV}.tar.gz"
 
 LICENSE="as-is"
@@ -16,14 +16,14 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
+	app-text/mupdf
+	dev-lang/tk
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	sci-chemistry/mosflm
-	sci-chemistry/xds-bin[smp]
 	sci-chemistry/pointless
-	sci-visualization/xds-viewer
+	sci-chemistry/xds-bin[smp]
 	sci-visualization/gnuplot
-	media-gfx/imagemagick
-	app-text/xpdf
-	dev-lang/tk"
+	sci-visualization/xds-viewer"
 # Need to clarified for licensing
 # sci-chemistry/xdsstat-bin
 DEPEND=""
@@ -32,15 +32,18 @@ S="${WORKDIR}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	sed "s:GENTOOTEMPLATE:${EPREFIX}/usr/share/${PN}/templates:g" -i ${PN} \
-	|| die
+	sed \
+		-e "s:GENTOOTEMPLATE:${EPREFIX}/usr/share/${PN}/templates:g" \
+		-e "s:kpdf:mupdf:g" \
+		-e "s:xds-viewer-0.6:xds-viewer:g" \
+		-i ${PN} || die
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 	insinto /usr/share/${PN}/templates
-	doins templates/{*.INP,bohr*,fortran,pauli,info.png,*.pck,tablesf_xdsi} || die
-	dodoc templates/*.pdf || die
+	doins templates/{*.INP,bohr*,fortran,pauli,info.png,*.pck,tablesf_xdsi}
+	dodoc templates/*.pdf
 }
 
 pkg_postinst() {