Remove redundant version

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index 29f6848d1a8da41038d083845574c61e1d2b8ab5..a2bea1f81559b61645b49942d1d516006bf820a8 100644 (file)
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/hippodraw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.19 2010/07/16 17:32:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.20 2010/07/16 17:33:40 xarthisius Exp $
+
+  16 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -hippodraw-1.21.3-r2.ebuild:
+  Remove redundant version
 
   16 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
   hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-automake-1.11.patch:

diff --git a/sci-visualization/hippodraw/Manifest b/sci-visualization/hippodraw/Manifest
index f6e43d4d046346704e8db376dcb0ff1749b2fe64..af5b1046742f3718a0a52caa1856e25ff1eb3371 100644 (file)
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -12,16 +12,15 @@ AUX hippodraw-1.21.3-qt4.patch 922 RMD160 e209a6f84b7f4f6801e84ff7fd2be9280e5d38
 AUX hippodraw-1.21.3-test-fix.patch 539 RMD160 3658745e4f8e449e845031ff561c5753a9fc9cda SHA1 774a47f7a1085940c63de8e652eefdd06652ae22 SHA256 f523f9298ec5887973831d42fa1881d9f6ac3bbd7656ffdb448eb197bc093bc9
 AUX hippodraw-1.21.3-wcslib.patch 879 RMD160 d339517136249a0a5c56edeb69abe652c82a9b06 SHA1 b7dde32740a1395ea2400be999e3b03edfb628c6 SHA256 49444a17b22b4448944c9b3e419c1fecb5ab551790705a1ac75bf5cd2957b670
 DIST HippoDraw-1.21.3.tar.gz 9087353 RMD160 33ab867739feda0caef29da9160c3e410de5fc35 SHA1 6959c564c0c366260b5b7ad81cce6efd2d30846b SHA256 a649dd51b4316ba54fad03cb7b39035ecd2d0efeea0cbff1a17d4790f7df0e28
-EBUILD hippodraw-1.21.3-r2.ebuild 3764 RMD160 d2d7d6dea9efdf13ddb0f2a0083296344ecab097 SHA1 bec34b48b2878bc9eac6a5b2da6697a1125d2479 SHA256 040644516fd8e3fac7a7a21a8761b21572358197f69495d47cf9305b13ee1732
 EBUILD hippodraw-1.21.3-r3.ebuild 4921 RMD160 27ddcd8eeb98e8ab5fefec1399ef14540511cbb9 SHA1 4ebe3988df002fb2d29b24f13f8d9c0c93453e9c SHA256 ce85795fb3d7745e67fff0e3789e8ec2343bb372a198b036e6d786b31b412c2b
-MISC ChangeLog 3940 RMD160 cee9270c5dff9d205beee2afe42e10a189765ec5 SHA1 20384a64cc11cb0404bc66c8079a30790cfa78c1 SHA256 c6c47de8eef22904866215fd326191b98e53f14aa0d5ac6a424795ee1338fe3f
+MISC ChangeLog 4053 RMD160 7d710db79289b1e1976b6b0f0246a031eee709fd SHA1 fa921ecc85a44425e42fb4ca71bb6732088518f6 SHA256 a80d2b3c4e2308c25f52e4c03f3f57483cdaad6a39a8b6da1a44bac1fdc4ff6d
 MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkxAl7gACgkQIiMqcbOVdxQhFwP8C7+mUmvemu6/52LRKuu4mZ8q
-/BUvS+iP71SniRL05MAVr11uxo8X2KQ2cl+1ZWUWFaUkebhHdDGNfj8/bHu6BJRi
-bA/DpG22HYx+lXDRGwZaYsbAIhrJ5BNh7xvKEh7YChOrzdw0V1KFUNLGwZ77aK2S
-hH8b8p/urAQox0Aw99E=
-=PQAN
+iJwEAQECAAYFAkxAmAoACgkQIiMqcbOVdxQuwAP+OGOwdGvhQoj7gjiQPBGLirdP
+CMnl4D+jhqj0lGD7kSmJPbitp1ihsGpbwkor1wLpfASJ97CE/0sgiRPKzu4XN0NL
+wl/U6X03Bo49kwldbCXReC3XXWenC42jk8WsY3kRg1w9y4r8C0Kdf790Xj3mgV1K
+LbGjWj4FOm0+Si4osJY=
+=8IdQ
 -----END PGP SIGNATURE-----

diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild
deleted file mode 100644 (file)
index 3a10c94..0000000
--- a/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r2.ebuild,v 1.1 2010/01/12 04:46:24 markusle Exp $
-
-EAPI=2
-
-inherit eutils autotools multilib qt4
-
-MY_PN=HippoDraw
-
-DESCRIPTION="Highly interactive data analysis Qt environment for C++ and python"
-HOMEPAGE="http://www.slac.stanford.edu/grp/ek/hippodraw/"
-SRC_URI="ftp://ftp.slac.stanford.edu/users/pfkeb/${PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples +fits +numpy root wcs"
-
-CDEPEND="dev-libs/boost[python]
-       virtual/latex-base
-       media-libs/netpbm
-       dev-lang/python[threads]
-       fits? ( sci-libs/cfitsio )
-       numpy? ( dev-python/numpy )
-       x11-libs/qt-gui:4
-       x11-libs/qt-qt3support:4
-       x11-libs/qt-assistant:4
-       root? ( >=sci-physics/root-5 )
-       !root? ( sci-libs/minuit )
-       wcs? ( sci-astronomy/wcslib )"
-
-DEPEND="${CDEPEND}
-       doc? ( app-doc/doxygen )"
-
-RDEPEND="${CDEPEND}
-       numpy? ( fits? ( dev-python/pyfits ) )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-gcc4.3.patch
-       epatch "${FILESDIR}"/${P}-gcc4.4.patch
-       epatch "${FILESDIR}"/${P}-numarray.patch
-       epatch "${FILESDIR}"/${P}-test-fix.patch
-       epatch "${FILESDIR}"/${P}-minuit2.patch
-       epatch "${FILESDIR}"/${P}-wcslib.patch
-       epatch "${FILESDIR}"/${P}-qt4.patch
-       epatch "${FILESDIR}"/${P}-autoconf-2.64.patch
-
-       # fix the install doc directory to gentoo's one
-       local docdir=/usr/share/doc/${PF}
-       sed -i \
-               -e "s:\(docdir\).*=.*:\1= ${docdir}:" \
-               -e "s:\(INSTALLDIR\).*=.*:\1= \$(DESTDIR)${docdir}/html:" \
-               -e "/^DOCS_STR/s:\(DOCS_STR\).*=.*:\1 = \\\\\"${docdir}/html\\\\\":" \
-               -e "s:\$(pkgdatadir)/examples:${docdir}/examples:" \
-               -e 's:LICENSE:README:' \
-               {.,doc,examples,qt}/Makefile.am || die "sed for docdir failed"
-
-       AT_M4DIR=config/m4 eautoreconf
-}
-
-src_configure() {
-       local myconf="
-               --disable-numarraybuild
-               $(use_enable numpy numpybuild)
-               $(use_enable doc help)"
-       # All these longuish conf options are necessary
-       # or else a huge patch
-       myconf="${myconf} --with-Qt-include-dir=no"
-       myconf="${myconf} --with-Qt-lib-dir=no"
-       myconf="${myconf} --with-Qt-bin-dir=no"
-       myconf="${myconf} --with-qt4-include=/usr/include/qt4"
-       myconf="${myconf} --with-qt4-lib=/usr/$(get_libdir)/qt4"
-       myconf="${myconf} --with-qt4-dir=/usr"
-
-       if use root; then
-               myconf="${myconf} --with-root-include=$(root-config --incdir)"
-               myconf="${myconf} --with-root-lib=$(root-config --libdir)"
-               myconf="${myconf} --with-minuit2-lib=no"
-       else
-               myconf="${myconf} --with-minuit2-include=/usr/include"
-               myconf="${myconf} --with-minuit2-lib=/usr/$(get_libdir)"
-               myconf="${myconf} --with-root-lib=no"
-       fi
-
-       if use fits; then
-               myconf="${myconf} --with-cfitsio-include=/usr/include"
-               myconf="${myconf} --with-cfitsio-lib=/usr/$(get_libdir)"
-       else
-               myconf="${myconf} --with-cfitsio-lib=no"
-       fi
-
-       if use wcs; then
-               myconf="${myconf} --with-wcslib-include=/usr/include"
-               myconf="${myconf} --with-wcslib-lib=/usr/$(get_libdir)"
-       else
-               myconf="${myconf} --with-wcslib-include=no"
-               myconf="${myconf} --with-wcslib-lib=no"
-       fi
-
-       econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
-       emake || die "emake failed"
-       if use doc; then
-               emake docs || die "emake docs failed"
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dosym ../${MY_PN}/hippoApp.png /usr/share/pixmaps/hippoApp.png
-       make_desktop_entry hippodraw HippoDraw hippoApp
-       if use examples; then
-               insinto /usr/share/doc/${PF}/testsuite
-               doins testsuite/*.py || die "examples install failed"
-               insinto /usr/share/doc/${PF}/examples
-               doins examples/*.{fits,tnt,data,baddata}*
-       else
-               # these are automatically installed
-               rm -rf "${D}"usr/share/doc/${PF}/examples || die
-       fi
-}