aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-chemistry/ccpn/ChangeLog6
-rw-r--r--sci-chemistry/ccpn/Manifest10
-rw-r--r--sci-chemistry/ccpn/ccpn-2.1.2_p1-r2.ebuild (renamed from sci-chemistry/ccpn/ccpn-2.1.2_p1-r1.ebuild)22
3 files changed, 22 insertions, 16 deletions
diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 1207d866e..d48184c28 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*ccpn-2.1.2_p1-r2 (23 Nov 2009)
+
+ 23 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ -ccpn-2.1.2_p1-r1.ebuild, +ccpn-2.1.2_p1-r2.ebuild:
+ Bad mistake in stting compile options --> leads to opengl crashes
+
*ccpn-2.1.2_p1-r1 (14 Nov 2009)
14 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index ce283942d..eb4c44aa5 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -19,14 +19,14 @@ EBUILD ccpn-2.1.0-r4.ebuild 4167 RMD160 63f746dd33faa4a753d24ae0fc75c31bde3c3a61
EBUILD ccpn-2.1.0.ebuild 4546 RMD160 86a4d9260ca3aa7a401e5b311bc336794d14f311 SHA1 1220889c05b6e9ba814ffa32d83360ed3eccf471 SHA256 afc425f1e75a995322972a51f899d52d69610953d5e59cdb968277695b54ab87
EBUILD ccpn-2.1.1-r1.ebuild 4195 RMD160 7e67b7712b448f098c01fbe0c19d1f5eab7a8d64 SHA1 4580a861ce8fcafe6c82254117339d3a0fc36db2 SHA256 6a945186e8d349b3d53de852b8d651889cdc092f5b3123ec3c2c40b56b75c81c
EBUILD ccpn-2.1.1.ebuild 4198 RMD160 8e96ef08f37bb6f611f04ebefefed19cfccd40d8 SHA1 514275f5692cacb255a7afa1f9a80d7280a5acf1 SHA256 a5ee0484748f116a6b304e33068e991ef13d5a50431fec4416c2e05c9ad5697a
-EBUILD ccpn-2.1.2_p1-r1.ebuild 3997 RMD160 7a4a1fe644565c50322f2bac9c2ba49d85d23bb3 SHA1 c5890dbde05bb61b5b0e61934b81728864be77b0 SHA256 23bd70944cacf3bf89e9340940d7ab32637d9dfd2325573f70b41fd5b5b9f25b
+EBUILD ccpn-2.1.2_p1-r2.ebuild 3996 RMD160 af35bbd5c3d7c34e90f70f007e878618efb681b5 SHA1 026ac03d80aad1d2740b4131b671596ffea0a0e5 SHA256 ffe8846f4da48d12a32af928d32055b2b14affc412d4ff455785b1a2401e78cc
EBUILD ccpn-2.1.2_p1.ebuild 4234 RMD160 b6c388a3e007f4be1e2f77bfd3fa99b09f09a616 SHA1 dfd1cf22e8966cce10cdbcde58d4c2177a642369 SHA256 ee19c851faeb6b97504b8684177c444ec9c630e90a359f46c5428c33834978f7
-MISC ChangeLog 4674 RMD160 cd0b9db5347534a7c86608821aed7a3d60675b41 SHA1 e26ea6e69df450d164789ef00d75e05e151c81ea SHA256 cf7e2f88a2828207302a7c8fe03850dc377de2fbec90553ada5a12f07d104ea1
+MISC ChangeLog 4887 RMD160 fde920112d6bb60ef14d0a1bfc9970a88714e05c SHA1 1ba8fd871bd452a691002fd52947eac562602e27 SHA256 40bb890be8e5455db5ec76d923578ff46d41d1970932bb3849f5673790dcf818
MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkr+mHoACgkQgAnW8HDreRak5wCgtvKec+l1DcEzdmBRBdcGhaib
-PGwAnRoczyttuL71tVtSQJzAqM+bpGzK
-=JrmV
+iEYEARECAAYFAksK5eAACgkQgAnW8HDreRaMgACgjh0qSM+lAhWxmARUp0AZspJk
+oR0AoJfiIRnQ2JfaxSUcmyXsqTkm6kHs
+=WImN
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r2.ebuild
index bb4099413..24943d262 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r1.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r2.ebuild
@@ -64,18 +64,18 @@ src_prepare() {
GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
sed \
- -e "s:^\(CC = \).*:\1$(tc-getCC):g" \
- -e "s:^\(OPT_FLAG = \).*:\1${CFLAGS}:g" \
+ -e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
+ -e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
- -e "s:^\(IGNORE_GL_FLAG = \).*:\1${IGNORE_GL_FLAG}:g" \
- -e "s:^\(GL_FLAG = \).*:\1${GL_FLAG}:g" \
- -e "s:^\(GLUT_NEED_INIT = \).*:\1${GLUT_NEED_INIT}:g" \
- -e "s:^\(GLUT_NOT_IN_GL = \).*:\1:g" \
- -e "s:^\(X11_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
- -e "s:^\(TCL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
- -e "s:^\(TK_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
- -e "s:^\(PYTHON_INCLUDE_FLAGS = \).*:\1-I\$(PYTHON_DIR)/include/python${PYVER}:g" \
- -e "s:^\(GL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
+ -e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
+ -e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
+ -e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
+ -e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
+ -e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
+ -e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
+ -e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
+ -e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
+ -e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
c/environment_default.txt > c/environment.txt
}