aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-12-12 11:21:18 +0100
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-12-12 11:21:31 +0100
commit38c6077a9b6e6cadc5ace68a455191469e3d12f8 (patch)
treef4b9359ca99fb1ff12ff9fe770e0f3f050e9b4b3
parentDeleted coin because it's has reached main tree (diff)
downloadsci-38c6077a9b6e6cadc5ace68a455191469e3d12f8.tar.gz
sci-38c6077a9b6e6cadc5ace68a455191469e3d12f8.tar.bz2
sci-38c6077a9b6e6cadc5ace68a455191469e3d12f8.zip
sci-chemistry/coot -- some fixes towards the gtk-2 migration from upstream
(Portage version: 2.2_rc58/git/Linux x86_64) (Signed Manifest commit)
-rw-r--r--sci-chemistry/coot/ChangeLog4
-rw-r--r--sci-chemistry/coot/Manifest12
-rw-r--r--sci-chemistry/coot/coot-9999.ebuild7
3 files changed, 14 insertions, 9 deletions
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index d5939284c..ca25d9fa5 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> coot-9999.ebuild:
+ reduce number ofmacro which we patch
+ added libidn as dep
+
*coot-0.6 (04 Dec 2009)
04 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 3dac33b90..559a3fb61 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -20,15 +20,15 @@ AUX gtkgl.m4 1137 RMD160 9f9712aeaa4efaf07a8c1c483abd4098ac823ef7 SHA1 f7bb50edc
AUX imlib.m4 11371 RMD160 4470d0cf2d0f8298bea6565069acda8a44e1cd9d SHA1 c983c372cb6cca546bb3fd739f68199a94a741c8 SHA256 04fcea84564608fff1b8049170f4dd571e9b30723c29c46e31855fab26b84a91
AUX link-against-guile-gtk-properly.patch 800 RMD160 4215ea41c02e7db2c04dda191e0200cc1704d43c SHA1 5bd24ab8c651a147076289098956f545c6e431d6 SHA256 7805cdf4e34c532899a8c37eb19664fc95fc8bc440e770db7c87373a94e1fb2d
DIST coot-0.6.tar.gz 11929700 RMD160 6485a56f1d17b103e69b07b5fc128d266e83aa27 SHA1 ec3d486eda514e36bdbc99e8796484e584e4f851 SHA256 7700e7e758934ee5b4177c7bb8e1d7d564b838966dd3c77919fa08778627353b
-DIST greg-data.tar.gz 7853711 RMD160 6da70a18af7c02139d9b9b1029bbf6624f0f1003 SHA1 2c9a336820eda69b0cca19dd8f2315b83ad96d65 SHA256 fd737f2b2337a589b849e1f6f8b3a3c422cc7650a8e3969e76d4141611621985
+DIST greg-data.tar.gz 7853709 RMD160 8fda42be9d84cb4a6d6b8c270a15493b42b0ddf1 SHA1 2099dbc093ae9a5cefa8f4b2eee1a38d982fa1eb SHA256 33a0caf21253f9be3b3af284dbebd58ac21628d353143d8533554452e3de25c6
EBUILD coot-0.6.ebuild 3483 RMD160 ccb7073bfe73955c85fef7d2a59f5cd2e8a9ce6f SHA1 c23507c9526ebd18353e976be4cf8090ed097733 SHA256 cf6dffd5cc517bc08de6f7235398428661ee3a993eea828c5c7dcdb178032761
-EBUILD coot-9999.ebuild 3937 RMD160 66cf094e5268b11f7689088c0d4433f79942624b SHA1 b019e1edd18108c8d212cc162f6451445f5d1682 SHA256 dc4e77f01f87fb49352525554cb21b04411219f4c92b597549db2a277aabf433
-MISC ChangeLog 6811 RMD160 84ea0c17c43d5e0a5108ee9b1d90a242546acb90 SHA1 b2fb82585b8d418db1f8a37a6ea0ef973c27e802 SHA256 80eee56e45aae1f7cf195af22edbc258cbde1cb4b937cd20485685a269b6d0b5
+EBUILD coot-9999.ebuild 3969 RMD160 a93cdae31f2893a0cd177c40243693c651681e2f SHA1 65aa2e37f177a97a428188932fe224d949336e10 SHA256 e012e7b698872564512fbd7676d4df001ad8b91039167e37b49aa4e93b68137c
+MISC ChangeLog 6948 RMD160 8895dff1ef8575b2606d4354cda79faf9e4ea337 SHA1 9760ebc7dcd01ee40d21d3c50a19c23cf9d01180 SHA256 ba1f77c57365173e70f6df72268614ab9d94a9f4d9d7744ea0d4328442e5753c
MISC metadata.xml 316 RMD160 845cc100ac244efa5f02595717b5da635f87d2f1 SHA1 c870d2c52c44dee3bab8623e5b6095266f400813 SHA256 64f6dbcd3bb41b26fd7897089cd60ddb93f1ea7d75f9531bca94f28b07e21b2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAksY6KIACgkQgAnW8HDreRaFkACgtSVsoYePLRhrBJWcl+sIRmPa
-JeUAn0kbx98C6txMbYfFfyMtOJ2/C/84
-=QscW
+iEYEARECAAYFAksjbp4ACgkQgAnW8HDreRZhygCgm6Qo7vbFCl6X54GvqSCRSuhe
+O2MAn0R5eXH0AjR9IvksGOnn3nPiNgS2
+=E6Xm
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index 77efe58be..a7f240195 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -52,7 +52,8 @@ RDEPEND="
${SCHEMEDEPS}
dev-python/pygtk
>=dev-libs/gmp-4.2.2-r2
- >=net-misc/curl-7.19.6"
+ >=net-misc/curl-7.19.6
+ net-dns/libidn"
DEPEND="${RDEPEND}
dev-lang/swig
test? ( dev-scheme/greg )"
@@ -77,10 +78,10 @@ src_prepare() {
sed -i \
-e "s:lfftw:lsfftw:g" \
-e "s:lrfftw:lsrfftw:g" \
- "${S}"/macros/clipper.m4
+ "${S}"/macros/clipper.m4 || die
# So we don't need to depend on crazy old gtk and friends
- cp "${FILESDIR}"/*.m4 "${S}"/macros/
+ cp "${FILESDIR}"/{glib,gtk}.m4 "${S}"/macros/
cat >> src/svn-revision.cc <<- EOF
extern "C" {