Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/sci-chemistry/ccpn
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-02-20 14:14:24 +0300
committerAlexey Shvetsov <alexxy@gentoo.org>2009-02-20 14:14:24 +0300
commit7192864757779961602ac290f83a2721a75eb144 (patch)
tree386eeb0fe769fbe29afc403e019fa15a4e99c5d5 /sci-chemistry/ccpn
parentAdd ~amd64 kyword to ccpn; make python not hardocded (diff)
downloadsci-7192864757779961602ac290f83a2721a75eb144.tar.gz
sci-7192864757779961602ac290f83a2721a75eb144.tar.bz2
sci-7192864757779961602ac290f83a2721a75eb144.zip
Make tk verion not hardcodded
(Portage version: 2.2_rc23/git/Linux x86_64) (Signed Manifest commit)
Diffstat (limited to 'sci-chemistry/ccpn')
-rw-r--r--sci-chemistry/ccpn/ChangeLog5
-rw-r--r--sci-chemistry/ccpn/Manifest20
-rw-r--r--sci-chemistry/ccpn/ccpn-2.0.6.1.ebuild3
-rw-r--r--sci-chemistry/ccpn/files/analysis4
-rw-r--r--sci-chemistry/ccpn/files/dangle4
-rw-r--r--sci-chemistry/ccpn/files/dataShifter4
-rw-r--r--sci-chemistry/ccpn/files/formatConverter4
-rw-r--r--sci-chemistry/ccpn/files/pipe2azara4
8 files changed, 28 insertions, 20 deletions
diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index d6a44c98b..c1a617721 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -5,6 +5,11 @@
20 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> files/analysis,
files/dangle, files/dataShifter, files/formatConverter, files/pipe2azara,
ccpn-2.0.6.1.ebuild:
+ Make tk verion not hardcodded
+
+ 20 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> files/analysis,
+ files/dangle, files/dataShifter, files/formatConverter, files/pipe2azara,
+ ccpn-2.0.6.1.ebuild:
Make python not hardcoded; add ~amd64 keywords
13 Feb 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 7c29e4621..51604a89d 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -1,24 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX analysis 310 RMD160 4d1538d4b39660902d21d344d366c7e0d746ecc2 SHA1 82ddd2a9b2a3ce36cdd09ff39185ebb5a0e0a04c SHA256 c37e7de574474eb3b1d05b2f6fcc1f3dc6625bfaece6c3ae0c4e54676a7793d0
-AUX dangle 306 RMD160 fa3c32edc51cdc645425e8571a51d2cfa446b30e SHA1 6bf25ff75a6e0d02293eec0ac523d83e2f6b2d1e SHA256 ac3c9eb52db61ec2907ca809b08b67533e9b4883fc27255ed7b5af1de1a68a9b
-AUX dataShifter 309 RMD160 8296d3e3c41a263aed91264c8ea2252faed3ee05 SHA1 3457025cf791fa6dbcea8c07a9552437d505fef4 SHA256 3c78fd3d5ae3311835eeceae76a0e68c7cffb8a4cbee1fbb7d0a8d6c4823798a
-AUX formatConverter 313 RMD160 4b2a2ba92fe3a34d43e79eb5fa20cbf7796ac830 SHA1 f099ff95b1fbd77c3719ec290e189ecc516f243e SHA256 a46e5c0d2bd804a3bc967ecf1516345d9c1a751a0633d9e3085dcc92c80faf72
+AUX analysis 314 RMD160 2d81f1441a67c515cc49949f73bf15c6e9d7015f SHA1 b082472f854725c5679ee68a2a3e5c3dbd05803f SHA256 24287af70a53db24febc0fb1eae56a2843572dd775d89d44514b0e4c866b1901
+AUX dangle 310 RMD160 2979dccb21e2980d4187ca2ec2bcb366009d0825 SHA1 c57fd0e06cf8856c1b341319d529fc30f7f88018 SHA256 296070a02fdfe80d8291240fdb47060ec089eea88783110cbf5d2698c207cc9e
+AUX dataShifter 313 RMD160 cd808e7e2386a79fad8ac2b6c19c66d2e29a7bb5 SHA1 6c2d1272b3c418dd9ace42fb9f8c97aa30963d16 SHA256 149d1d8e141a99f404312be80e3f9fa73cb20395f0147f883e35a5d744674b2b
+AUX formatConverter 317 RMD160 6262b4673061bd8409dccdb58e218a495f7c33b9 SHA1 1a61a4bd58dbd2b39b4735ce549adcb351049dee SHA256 cb273cc3ea1df20d9e218dd29b02283440be5c015c8ce226e49c8fff04f6e0ad
AUX missing-link.patch 560 RMD160 17eec66581c4c120306464cd89486283fd1bfc89 SHA1 82198fdc32e22c488a679656c3cc6ac18c7e76ad SHA256 db5518683e254304f8de1420b102bfe08051839666a9edf2529d3235946ecd88
-AUX pipe2azara 317 RMD160 cffb85dfeef3f6ffb29e2029a805d7ca9a0a484e SHA1 1bf3b4c54a3242e9a08135cb4c710a458698d275 SHA256 fd6b74194424b12ae9dcba008529237fee7d0803eeaf13939d43d334dacea50b
+AUX pipe2azara 321 RMD160 481fc373c88e568c909cf7759740f3ab6e0be694 SHA1 33972857600b54c5806befb86079af4bdd759121 SHA256 318dffebaad08cd448e64660ba0cfbf8df341b2b5e554e66b7ed27a9a1a2dcf9
DIST analysis2.0.5.tar.gz 17200055 RMD160 9c6429c00711385462cd753a7c9cd103f9b2cbb4 SHA1 4240c2be876e86b894d2958c218d85976f9f581c SHA256 9b91d4fffbc8fee3449f24af5fc49ca9e633cbafd8f049d8c274dfd30f5acea9
DIST analysis2.0.6.1.tar.gz 17350243 RMD160 97ee6fa30fdcf1f4f237ab40f20086e5bb3c7f9f SHA1 1b42c0178e7007a5ff57c7554cb4c9caff8e8048 SHA256 b7446fb95e9bf6b49aed42b4a89a9efb4779b7823b4a91297307a5178a5d5ede
DIST analysis2.0.6.tar.gz 17351891 RMD160 16d66a2cad36aa65a354ae1524af50f7c6576910 SHA1 cedc7a55a17a9e904a1d575850dc5f6c4fb06e85 SHA256 bfe1aec93f8fe80fc7c6914854239defddde498ffb10a692b7f7445a0563a10f
EBUILD ccpn-2.0.5.ebuild 4107 RMD160 fa2bb3059e9c1bccdb74d0be85c7d9b0c221e460 SHA1 0f795c48bbf99b41cf09de0403839cf64dbb174a SHA256 602a8a0cf16e0bfe29cf30ca045bfc72b9bc78cb64f498173a6938abb1267e4c
-EBUILD ccpn-2.0.6.1.ebuild 4141 RMD160 c3be784c0dc0bb1e072d056e05789f2e73d91d43 SHA1 3c173986da8ce1e16ce60affbd28fd19f6688eb6 SHA256 e1eec7ba772d7c4057cd29652eab604daae1ee3b4be159976f7c0dccd3ba7b24
+EBUILD ccpn-2.0.6.1.ebuild 4248 RMD160 fc94dd05749b7695a5055ae328d1bea79da16314 SHA1 7a966acc6ef7893f9cc6609b2a4b27c68c9b3e95 SHA256 ca9cf97d4f236e5f015323981b467968431b51cdcd7c1e74197522f7bfba5099
EBUILD ccpn-2.0.6.ebuild 4134 RMD160 6e0dbc8cb9c1db2993ebddd218f1623f89a011b7 SHA1 7ad71dc7a4a970cb937347084bc44f8979ea38f0 SHA256 68fd43847af32bfab8c74b7c3f383cbfe6aae291d48a633d944becf6021a6c83
-MISC ChangeLog 1325 RMD160 962ba29e657110b02966a6113144a2914bf11677 SHA1 8ab636cb30eba0982a1738b4969d06664fddb7e1 SHA256 32f1e597ad7cb8af1411e62e27e6dc5d11ad4b2eda6fef691713a4f773f8e237
+MISC ChangeLog 1524 RMD160 277732f4574acb7eeb0378af2f3d0f02e1aeadae SHA1 87ce3676c6321ae7d7ba79ee1ef95cd8e1409013 SHA256 e897431fa8b880166efc117a30ec49a86b683bb47b8802c05ac7a632323a54cd
MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (GNU/Linux)
-iEYEARECAAYFAkmejrUACgkQ5BmOA85PVLjycQCgnQ5Fl0yyaYJYMgLzNvm0Riut
-XEgAn2a46Q4XNe78Qni6MUBNAtxAJH8O
-=Y5ob
+iEYEARECAAYFAkmekJAACgkQ5BmOA85PVLh5+ACcDtWQNV+btuXVVmCF/qURYLc/
+UrsAniq7i64UId0aiJg7via0UWiptsxn
+=egvr
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.0.6.1.ebuild b/sci-chemistry/ccpn/ccpn-2.0.6.1.ebuild
index e2fd7e0b4..dc570e115 100644
--- a/sci-chemistry/ccpn/ccpn-2.0.6.1.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.0.6.1.ebuild
@@ -112,14 +112,17 @@ src_install() {
local GENTOO_SITEDIR
local LIBDIR
local FILES
+ local TKVER
IN_PATH=$(python_get_sitedir)/${PN}
GENTOO_SITEDIR=$(python_get_sitedir)
LIBDIR=$(get_libdir)
+ TKVER=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
for wrapper in analysis dangle dataShifter formatConverter pipe2azara; do
sed -e "s:GENTOO_SITEDIR:${GENTOO_SITEDIR}:g" \
-e "s:LIBDIR:${LIBDIR}:g" \
+ -e "s:TKVER:${TKVER}:g" \
"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
done
diff --git a/sci-chemistry/ccpn/files/analysis b/sci-chemistry/ccpn/files/analysis
index d81a07824..72d2883c1 100644
--- a/sci-chemistry/ccpn/files/analysis
+++ b/sci-chemistry/ccpn/files/analysis
@@ -3,6 +3,6 @@
export CCPNMR_TOP_DIR=GENTOO_SITEDIR
export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
export LD_LIBRARY_PATH=/usr/LIBDIR
-export TCL_LIBRARY=/usr/LIBDIR/tcl8.4
-export TK_LIBRARY=/usr/LIBDIR/tk8.4
+export TCL_LIBRARY=/usr/LIBDIR/tclTKVER
+export TK_LIBRARY=/usr/LIBDIR/tkTKVER
/usr/bin/python -i -O ${CCPNMR_TOP_DIR}/ccpn/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5 $6
diff --git a/sci-chemistry/ccpn/files/dangle b/sci-chemistry/ccpn/files/dangle
index 4a62a536f..70fb65c59 100644
--- a/sci-chemistry/ccpn/files/dangle
+++ b/sci-chemistry/ccpn/files/dangle
@@ -3,6 +3,6 @@
export CCPNMR_TOP_DIR=GENTOO_SITEDIR
export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
export LD_LIBRARY_PATH=/usr/LIBDIR
-export TCL_LIBRARY=/usr/LIBDIR/tcl8.4
-export TK_LIBRARY=/usr/LIBDIR/tk8.4
+export TCL_LIBRARY=/usr/LIBDIR/tclTKVER
+export TK_LIBRARY=/usr/LIBDIR/tkTKVER
/usr/bin/python -O ${CCPNMR_TOP_DIR}/ccpn/python/cambridge/dangle/DangleGui.py $1 $2 $3 $4 $5 $6
diff --git a/sci-chemistry/ccpn/files/dataShifter b/sci-chemistry/ccpn/files/dataShifter
index 993c8880a..59111f892 100644
--- a/sci-chemistry/ccpn/files/dataShifter
+++ b/sci-chemistry/ccpn/files/dataShifter
@@ -3,6 +3,6 @@
export CCPNMR_TOP_DIR=GENTOO_SITEDIR
export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
export LD_LIBRARY_PATH=/usr/LIBDIR
-export TCL_LIBRARY=/usr/LIBDIR/tcl8.4
-export TK_LIBRARY=/usr/LIBDIR/tk8.4
+export TCL_LIBRARY=/usr/LIBDIR/tclTKVER
+export TK_LIBRARY=/usr/LIBDIR/tkTKVER
/usr/bin/python -O ${CCPNMR_TOP_DIR}/ccpn/python/ccpnmr/format/gui/DataShifter.py $1 $2 $3 $4 $5 $6
diff --git a/sci-chemistry/ccpn/files/formatConverter b/sci-chemistry/ccpn/files/formatConverter
index 5a702ab11..c9468a2b4 100644
--- a/sci-chemistry/ccpn/files/formatConverter
+++ b/sci-chemistry/ccpn/files/formatConverter
@@ -3,6 +3,6 @@
export CCPNMR_TOP_DIR=GENTOO_SITEDIR
export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
export LD_LIBRARY_PATH=/usr/LIBDIR
-export TCL_LIBRARY=/usr/LIBDIR/tcl8.4
-export TK_LIBRARY=/usr/LIBDIR/tk8.4
+export TCL_LIBRARY=/usr/LIBDIR/tclTKVER
+export TK_LIBRARY=/usr/LIBDIR/tkTKVER
/usr/bin/python -O ${CCPNMR_TOP_DIR}/ccpn/python/ccpnmr/format/gui/FormatConverter.py $1 $2 $3 $4 $5 $6
diff --git a/sci-chemistry/ccpn/files/pipe2azara b/sci-chemistry/ccpn/files/pipe2azara
index 768246ad2..7b5fc5a13 100644
--- a/sci-chemistry/ccpn/files/pipe2azara
+++ b/sci-chemistry/ccpn/files/pipe2azara
@@ -3,6 +3,6 @@
export CCPNMR_TOP_DIR=GENTOO_SITEDIR
export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
export LD_LIBRARY_PATH=/usr/LIBDIR
-export TCL_LIBRARY=/usr/LIBDIR/tcl8.4
-export TK_LIBRARY=/usr/LIBDIR/tk8.4
+export TCL_LIBRARY=/usr/LIBDIR/tclTKVER
+export TK_LIBRARY=/usr/LIBDIR/tkTKVER
/usr/bin/python -O ${CCPNMR_TOP_DIR}/ccpn/python/ccp/format/spectra/params/NmrPipeData.py $1 $2 $3 $4 $5 $6