diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-01-10 12:37:33 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-01-10 12:37:33 +0000 |
| commit | 73d0a87cf16b762f647316c99e0b84fc920abaec (patch) | |
| tree | 7453798de0ade323caca118264686aa3ffb04ceb /sci-chemistry | |
| parent | Stable on amd64 wrt bug 344677 (diff) | |
| download | historical-73d0a87cf16b762f647316c99e0b84fc920abaec.tar.gz historical-73d0a87cf16b762f647316c99e0b84fc920abaec.tar.bz2 historical-73d0a87cf16b762f647316c99e0b84fc920abaec.zip | |
Correct dependencies, fix library install path wrt #351246, fix doc install path. Drop old.
Package-Manager: portage-2.2.0_alpha10_p22/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/molsketch/ChangeLog | 11 | ||||
| -rw-r--r-- | sci-chemistry/molsketch/Manifest | 14 | ||||
| -rw-r--r-- | sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild (renamed from sci-chemistry/molsketch/molsketch-0.2.0.ebuild) | 21 |
3 files changed, 26 insertions, 20 deletions
diff --git a/sci-chemistry/molsketch/ChangeLog b/sci-chemistry/molsketch/ChangeLog index 31418b264414..bddea432fcfd 100644 --- a/sci-chemistry/molsketch/ChangeLog +++ b/sci-chemistry/molsketch/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-chemistry/molsketch -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/ChangeLog,v 1.1 2010/11/02 09:20:03 jlec Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/ChangeLog,v 1.2 2011/01/10 12:37:32 xarthisius Exp $ + +*molsketch-0.2.0-r1 (10 Jan 2011) + + 10 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> -molsketch-0.2.0.ebuild, + +molsketch-0.2.0-r1.ebuild: + Correct dependencies, fix library install path wrt #351246, fix doc install + path. Drop old. 02 Nov 2010; Justin Lecher <jlec@gentoo.org> +molsketch-0.2.0.ebuild, +metadata.xml: diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest index 6a13a6cb6a31..bff99f6ec692 100644 --- a/sci-chemistry/molsketch/Manifest +++ b/sci-chemistry/molsketch/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST Molsketch-0.2.0-Source.tar.gz 276809 RMD160 1dd18878bc2f2ec2fdf6d2eb54e85f47512d5c07 SHA1 a70205f89f0bcfcb280239ee51832ba34b8b15bd SHA256 05e058bf71fc99e5dda56ef1779a82c8885b2001d1af5dce92d959bf56d8a5d0 -EBUILD molsketch-0.2.0.ebuild 794 RMD160 19e488ac45983a8054d0e1ff1656ca06ba0c685b SHA1 6aa5828f17f0f72406c22241e2151730015eb9b7 SHA256 e8f9f647b97aab11d67301a170917465cd7ee5d354b70de6a98356ca7dc8ddec -MISC ChangeLog 531 RMD160 5549cec7311ed82e0b6ed3cf57e5705b8e9eeb64 SHA1 bc6ab09254dc0bebd143490ae61ff0e5e7950a2c SHA256 b4f7a0fadaa0b307721690ba21f9e951a1b627e153444f2e898c1257d1dc004d +EBUILD molsketch-0.2.0-r1.ebuild 1107 RMD160 82fe25dca456a57b0523e4d6b9d5feabc546b389 SHA1 0a9ac0ab65cc76398230744e03869f79c0ce840a SHA256 227542500ccd025ee082f6f2db24b077f07431a004003bd833811d812d3f4cfc +MISC ChangeLog 778 RMD160 2ab34ea80f5a389099a8088a662c2780c432ba5c SHA1 206be8c2249a913cc2b6e93894350c18600b1a20 SHA256 3d5db149c355e627a53a8a79aec15ac29d76494680dd36bd80b4bedc212e8e0c MISC metadata.xml 624 RMD160 079d3f672dce0dee3a951152e6fb97e0579a15e8 SHA1 6f9367fe94191650e3110b64f005606cb887727b SHA256 b0963a279abd1d78745c6de3b2176c9c553bd3c1cbbf341be2cf7260af3d5844 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkzP18gACgkQgAnW8HDreRYJHQCdEUftChmCK1Tv28tcWMt4PFdz -IMcAn1w1+Ph1ojrvBodkk9F3IB9sa1Q0 -=xNcX ------END PGP SIGNATURE----- diff --git a/sci-chemistry/molsketch/molsketch-0.2.0.ebuild b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild index a676604b130f..6f478e67ba45 100644 --- a/sci-chemistry/molsketch/molsketch-0.2.0.ebuild +++ b/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.2.0.ebuild,v 1.1 2010/11/02 09:20:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molsketch/molsketch-0.2.0-r1.ebuild,v 1.1 2011/01/10 12:37:32 xarthisius Exp $ EAPI=3 -inherit cmake-utils +inherit cmake-utils multilib -MY_P="${P/m/M}-Source" +MY_P=${P/m/M}-Source DESCRIPTION="A drawing tool for 2D molecular structures" HOMEPAGE="http://molsketch.sourceforge.net/" -SRC_URI="mirror://sourceforge/molsketch/${MY_P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -20,11 +20,20 @@ IUSE="" DEPEND="sci-chemistry/openbabel x11-libs/qt-core:4 x11-libs/qt-gui:4 - x11-libs/qt-assistant:4" + x11-libs/qt-test:4 + || ( >=x11-libs/qt-assistant-4.7.0:4[compat] + <x11-libs/qt-assistant-4.7.0:4 )" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} +src_prepare() { + sed -e "/LIBRARY DESTINATION/ s/lib/$(get_libdir)/g" \ + -i libmolsketch/src/CMakeLists.txt || die #351246 + sed -e "s:doc/molsketch:doc/${PF}:g" \ + -i molsketch/src/{CMakeLists.txt,mainwindow.cpp} || die +} + src_configure() { local mycmakeargs=" -DOPENBABEL2_INCLUDE_DIR=${EPREFIX}/usr/include/openbabel-2.0" |