| 1 |
markusle 09/11/03 05:30:06 |
| 2 |
|
| 3 |
Added: apbs-1.2.0-install-fix.patch apbs-1.2.0-link.patch |
| 4 |
apbs-1.2.0-contrib.patch |
| 5 |
Removed: apbs-examples-gentoo.patch apbs-gcc4-gentoo.patch |
| 6 |
Log: |
| 7 |
Version bump (fixes bug #262905) and removed old ebuilds. |
| 8 |
(Portage version: 2.1.7.3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.0-install-fix.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: apbs-1.2.0-install-fix.patch |
| 17 |
=================================================================== |
| 18 |
diff -Naur apbs-1.2-source/Makefile.am apbs-1.2-source.new/Makefile.am |
| 19 |
--- apbs-1.2-source/Makefile.am 2009-10-14 13:20:55.000000000 -0400 |
| 20 |
+++ apbs-1.2-source.new/Makefile.am 2009-11-02 23:31:41.000000000 -0500 |
| 21 |
@@ -28,10 +28,19 @@ |
| 22 |
-rm -f ./bin/apbs |
| 23 |
|
| 24 |
install-data-local: |
| 25 |
- mkdir -p ${prefix}/share |
| 26 |
- -cp -rf examples ${prefix}/share |
| 27 |
- -cp -rf doc ${prefix}/share |
| 28 |
- -cp -rf tools ${prefix}/share |
| 29 |
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples |
| 30 |
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools |
| 31 |
+ -rm -f doc/LICENSE.txt |
| 32 |
+ -rm -f tools/manip/*.pyc |
| 33 |
+ -rm -f tools/**/*.o |
| 34 |
+ -rm -f tools/**/Makefile* |
| 35 |
+ -rm -f tools/**/**/*.o |
| 36 |
+ -rm -f tools/**/**/Makefile* |
| 37 |
+ -rm -f tools/Makefile* |
| 38 |
+ -rm -f examples/Makefile* |
| 39 |
+ -rm -f examples/**/Makefile* |
| 40 |
+ -cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
| 41 |
+ -cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
| 42 |
|
| 43 |
test: |
| 44 |
cd examples; make test |
| 45 |
diff -Naur apbs-1.2-source/bin/Makefile.am apbs-1.2-source.new/bin/Makefile.am |
| 46 |
--- apbs-1.2-source/bin/Makefile.am 2009-10-14 13:20:48.000000000 -0400 |
| 47 |
+++ apbs-1.2-source.new/bin/Makefile.am 2009-11-02 23:31:15.000000000 -0500 |
| 48 |
@@ -40,6 +40,4 @@ |
| 49 |
include_HEADERS = routines.h |
| 50 |
|
| 51 |
install-data-local: |
| 52 |
- -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin |
| 53 |
- -chmod 755 ${prefix}/bin/ApbsClient.py |
| 54 |
- -rm -f ${prefix}/bin/wsdl2py |
| 55 |
\ No newline at end of file |
| 56 |
+ -rm -f $(DESTDIR)${prefix}/bin/wsdl2py |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 sci-chemistry/apbs/files/apbs-1.2.0-link.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.0-link.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.0-link.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: apbs-1.2.0-link.patch |
| 66 |
=================================================================== |
| 67 |
diff -Naur apbs-1.2-source/tools/python/Makefile.am apbs-1.2-source.new/tools/python/Makefile.am |
| 68 |
--- apbs-1.2-source/tools/python/Makefile.am 2009-10-14 13:20:57.000000000 -0400 |
| 69 |
+++ apbs-1.2-source.new/tools/python/Makefile.am 2009-10-29 16:08:18.000000000 -0400 |
| 70 |
@@ -15,5 +15,5 @@ |
| 71 |
|
| 72 |
noinst_PROGRAMS = _apbslib.so |
| 73 |
_apbslib_so_SOURCES = apbslib.c |
| 74 |
-_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) |
| 75 |
-_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS) |
| 76 |
+_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED) |
| 77 |
+_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) |
| 78 |
diff -Naur apbs-1.2-source/tools/python/vgrid/Makefile.am apbs-1.2-source.new/tools/python/vgrid/Makefile.am |
| 79 |
--- apbs-1.2-source/tools/python/vgrid/Makefile.am 2009-10-14 13:20:57.000000000 -0400 |
| 80 |
+++ apbs-1.2-source.new/tools/python/vgrid/Makefile.am 2009-10-29 16:08:29.000000000 -0400 |
| 81 |
@@ -15,6 +15,6 @@ |
| 82 |
if PY_PRESENT |
| 83 |
noinst_PROGRAMS = _vgrid.so |
| 84 |
_vgrid_so_SOURCES = vgridlib.c |
| 85 |
- _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED) |
| 86 |
- _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@ |
| 87 |
+ _vgrid_so_LINK = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED) |
| 88 |
+ _vgrid_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a @lib_list@ |
| 89 |
endif |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.1 sci-chemistry/apbs/files/apbs-1.2.0-contrib.patch |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.0-contrib.patch?rev=1.1&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.0-contrib.patch?rev=1.1&content-type=text/plain |
| 97 |
|
| 98 |
Index: apbs-1.2.0-contrib.patch |
| 99 |
=================================================================== |
| 100 |
--- contrib/Makefile.am 2009-03-05 21:30:09.000000000 +0100 |
| 101 |
+++ contrib/Makefile.am.new 2009-04-24 19:08:39.000000000 +0200 |
| 102 |
@@ -9,6 +9,6 @@ |
| 103 |
AUTOMAKE_OPTIONS = no-dependencies |
| 104 |
SUFFIXES = .H .h .C .c .f .o |
| 105 |
|
| 106 |
-always_built_SUBDIRS = @apbs_do_blas@ @apbs_do_maloc@ pmgZ aqua opal |
| 107 |
+always_built_SUBDIRS = @apbs_do_blas@ @apbs_do_maloc@ pmgZ aqua |
| 108 |
|
| 109 |
SUBDIRS = $(always_built_SUBDIRS) . |
Archives