From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 71CBE1381F3 for ; Thu, 19 Sep 2013 03:21:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3271E0BCC; Thu, 19 Sep 2013 03:21:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA196E0BCC for ; Thu, 19 Sep 2013 03:21:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BB2033EAE2 for ; Thu, 19 Sep 2013 03:21:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DA9DFE530A for ; Thu, 19 Sep 2013 03:21:13 +0000 (UTC) From: "Francois Bissey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Francois Bissey" Message-ID: <1379555685.04a094f4fc7173fe3b715674e69fd6dc24309fb2.fbissey@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/modglue/files/, sci-libs/modglue/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/modglue/ChangeLog sci-libs/modglue/files/modglue-1.16-ldflags.patch sci-libs/modglue/files/modglue-1.16-parallelmake.patch sci-libs/modglue/files/modglue-1.19-ldflags.patch sci-libs/modglue/files/modglue-1.19-parallelmake.patch sci-libs/modglue/modglue-1.16.ebuild sci-libs/modglue/modglue-1.19.ebuild X-VCS-Directories: sci-libs/modglue/files/ sci-libs/modglue/ X-VCS-Committer: fbissey X-VCS-Committer-Name: Francois Bissey X-VCS-Revision: 04a094f4fc7173fe3b715674e69fd6dc24309fb2 X-VCS-Branch: master Date: Thu, 19 Sep 2013 03:21:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4fdb8ae7-0031-43e6-bd2e-2c015a09a430 X-Archives-Hash: bd9aefa389da870b09dd70d01a28e743 commit: 04a094f4fc7173fe3b715674e69fd6dc24309fb2 Author: François Bissey canterbury ac nz> AuthorDate: Thu Sep 19 01:41:57 2013 +0000 Commit: Francois Bissey massey ac nz> CommitDate: Thu Sep 19 01:54:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=04a094f4 bump modglue to 1.19 Package-Manager: portage-2.2.6 --- sci-libs/modglue/ChangeLog | 8 ++++++++ ...e-1.16-ldflags.patch => modglue-1.19-ldflags.patch} | 11 ++++++----- ...allelmake.patch => modglue-1.19-parallelmake.patch} | 18 +++++++++--------- .../{modglue-1.16.ebuild => modglue-1.19.ebuild} | 10 +++++----- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/sci-libs/modglue/ChangeLog b/sci-libs/modglue/ChangeLog index eb811e9..bc9c7e4 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 + +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 modglue-1.16.ebuild: Fix PATCHES definition, it shouldn't include 'epatch' diff --git a/sci-libs/modglue/files/modglue-1.16-ldflags.patch b/sci-libs/modglue/files/modglue-1.19-ldflags.patch similarity index 59% rename from sci-libs/modglue/files/modglue-1.16-ldflags.patch rename to sci-libs/modglue/files/modglue-1.19-ldflags.patch index 4c2bbbc..a564d4f 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 similarity index 77% rename from sci-libs/modglue/files/modglue-1.16-parallelmake.patch rename to sci-libs/modglue/files/modglue-1.19-parallelmake.patch index b6d6750..b3dc35e 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 similarity index 84% rename from sci-libs/modglue/modglue-1.16.ebuild rename to sci-libs/modglue/modglue-1.19.ebuild index ab4602c..ca84311 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/. )