aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <francois.bissey@canterbury.ac.nz>2013-09-19 13:41:57 +1200
committerFrançois Bissey <francois.bissey@canterbury.ac.nz>2013-09-19 13:54:45 +1200
commit04a094f4fc7173fe3b715674e69fd6dc24309fb2 (patch)
treebe30ccb662083d8afaee45b0f2039ccf996c1bd4
parentsci-chemistry/freeon-1.0.2: Version bump (diff)
downloadsci-04a094f4fc7173fe3b715674e69fd6dc24309fb2.tar.gz
sci-04a094f4fc7173fe3b715674e69fd6dc24309fb2.tar.bz2
sci-04a094f4fc7173fe3b715674e69fd6dc24309fb2.zip
bump modglue to 1.19
Package-Manager: portage-2.2.6
-rw-r--r--sci-libs/modglue/ChangeLog8
-rw-r--r--sci-libs/modglue/Manifest2
-rw-r--r--sci-libs/modglue/files/modglue-1.19-ldflags.patch (renamed from sci-libs/modglue/files/modglue-1.16-ldflags.patch)11
-rw-r--r--sci-libs/modglue/files/modglue-1.19-parallelmake.patch (renamed from sci-libs/modglue/files/modglue-1.16-parallelmake.patch)18
-rw-r--r--sci-libs/modglue/modglue-1.19.ebuild (renamed from sci-libs/modglue/modglue-1.16.ebuild)10
5 files changed, 29 insertions, 20 deletions
diff --git a/sci-libs/modglue/ChangeLog b/sci-libs/modglue/ChangeLog
index eb811e97d..bc9c7e433 100644
--- a/sci-libs/modglue/ChangeLog
+++ b/sci-libs/modglue/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*modglue-1.19 (18 Sep 2013)
+
+ 18 Sep 2013; François Bissey <francois.bissey@canterbury.ac.nz>
+ +files/modglue-1.19-ldflags.patch, +files/modglue-1.19-parallelmake.patch,
+ +modglue-1.19.ebuild, -files/modglue-1.16-ldflags.patch,
+ -files/modglue-1.16-parallelmake.patch, -modglue-1.16.ebuild:
+ Bump modglue to 1.19
+
03 Sep 2013; François Bissey <francois.bissey@canterbury.ac.nz>
modglue-1.16.ebuild:
Fix PATCHES definition, it shouldn't include 'epatch'
diff --git a/sci-libs/modglue/Manifest b/sci-libs/modglue/Manifest
index 9c45f3be3..1f7db367c 100644
--- a/sci-libs/modglue/Manifest
+++ b/sci-libs/modglue/Manifest
@@ -1 +1 @@
-DIST modglue-1.16.tar.gz 89987 SHA256 1da62910d7171cb5547c0757c366e5338f889c0155c33375e891df75e2ee429e SHA512 2ac93f771f99b33f6339ceb55ba95c034c37d84b3d8ee6a56a8c75e7b6129cf3a218adb5539df37da2c5f645983eb7c141c9716ad5c94699e2f44396609d7f2a WHIRLPOOL 39f399b30c3762fa6522444051f81bb8d484448681735e8e1c0d304f0f8ebc5e281853257dffc506ab3f864025cab373b608720e0645ed8397ec7fc2fe8625af
+DIST modglue-1.19.tar.gz 94435 SHA256 f228e6666e328a44472a3b8755aba317d38330af322023ce404146d504544f73 SHA512 cdf069dd28674076f9f7275112b4bd96b58c1bfd238ec9570a29a13bca1d8fcdad8c1b8d1fd78aca3ece95890a54d4a8d13db2a3299f4ec6f6475d13145599bf WHIRLPOOL 7b3ae11d18737b859a32a65787e1c445a9e63eaa66cd1a93f06828ec875891f50fcdb069bf7e1173e61e3f04ccbf9e55f071a26ffbe0936030df3a6c24ee2ef5
diff --git a/sci-libs/modglue/files/modglue-1.16-ldflags.patch b/sci-libs/modglue/files/modglue-1.19-ldflags.patch
index 4c2bbbc27..a564d4fb2 100644
--- a/sci-libs/modglue/files/modglue-1.16-ldflags.patch
+++ b/sci-libs/modglue/files/modglue-1.19-ldflags.patch
@@ -1,12 +1,13 @@
---- src/Makefile.in.orig 2010-08-19 23:38:00.081085063 +1200
-+++ src/Makefile.in 2010-08-19 23:38:56.018083508 +1200
-@@ -15,8 +15,8 @@
+--- src/Makefile.in.orig 2013-09-04 14:20:05.437329795 +1200
++++ src/Makefile.in 2013-09-04 14:25:11.533806416 +1200
+@@ -21,9 +21,9 @@
LTRELEASE = `echo ${RELEASE} | sed -e "s/\./:/g"`
CPHASE = ${LIBTOOL} --tag=CXX --mode=compile @CXX@ -c @CFLAGS@
--LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@/@libdir@ @LIBS@
+-LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@@libdir@ @LIBS@
++LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LDFLAGS@ -rpath @libdir@ @LIBS@
+ #LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LIBS@
-MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@
-+LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LDFLAGS@ -rpath @prefix@/@libdir@ @LIBS@
+MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ @LDFLAGS@
IPHASE = ${LIBTOOL} --mode=install @INSTALL@
FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@
diff --git a/sci-libs/modglue/files/modglue-1.16-parallelmake.patch b/sci-libs/modglue/files/modglue-1.19-parallelmake.patch
index b6d675084..b3dc35e7b 100644
--- a/sci-libs/modglue/files/modglue-1.16-parallelmake.patch
+++ b/sci-libs/modglue/files/modglue-1.19-parallelmake.patch
@@ -1,17 +1,17 @@
---- Makefile.in.orig 2010-08-21 22:04:51.877629329 +1200
-+++ Makefile.in 2010-08-21 22:06:12.887628815 +1200
-@@ -7,7 +7,7 @@
- #examples
+--- Makefile.in.orig 2013-09-04 14:12:33.436620240 +1200
++++ Makefile.in 2013-09-04 14:13:31.051711085 +1200
+@@ -8,7 +8,7 @@
library:
+ echo @libdir@
- ( cd src && $(MAKE) );
+ ( cd src && $(MAKE) library tools );
static:
( cd src && $(MAKE) static );
---- src/Makefile.in.orig 2010-08-21 22:05:26.411630332 +1200
-+++ src/Makefile.in 2010-08-21 22:08:20.961629492 +1200
-@@ -49,21 +49,21 @@
+--- src/Makefile.in.orig 2013-09-04 14:13:46.820735926 +1200
++++ src/Makefile.in 2013-09-04 14:15:46.020923434 +1200
+@@ -56,21 +56,21 @@
#------- Tests ----------------------------------------
@@ -36,9 +36,9 @@
-prompt: prompt.o
+prompt: library prompt.o
${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la
+ # chrpath -d .libs/prompt
- prompt_static: prompt.cc library
-@@ -77,10 +77,10 @@
+@@ -85,10 +85,10 @@
endif
diff --git a/sci-libs/modglue/modglue-1.16.ebuild b/sci-libs/modglue/modglue-1.19.ebuild
index ab4602cd4..ca843118c 100644
--- a/sci-libs/modglue/modglue-1.16.ebuild
+++ b/sci-libs/modglue/modglue-1.19.ebuild
@@ -24,14 +24,14 @@ DEPEND="${RDEPEND}
AUTOTOOLS_IN_SOURCE_BUILD=1
PATCHES=(
- # Respect LDFLAGS
- "${FILESDIR}"/${P}-ldflags.patch
+ # Respect LDFLAGS (and a last bit of 64bit problem)
+ "${FILESDIR}"/${PN}-1.19-ldflags.patch
# fix parallel make. test are made at the same time as the library??
- "${FILESDIR}"/${P}-parallelmake.patch
+ "${FILESDIR}"/${PN}-1.19-parallelmake.patch
# take care of the lib/lib64 problem. Without this modglue installs
# stuff in /usr/usr/lib64 on 64bits systems.
- "${FILESDIR}"/${P}-lib64.patch
-)
+ "${FILESDIR}"/${PN}-1.16-lib64.patch
+ )
src_install() {
use doc && HTML_DOCS=( "${S}"/doc/. )