From: Justin Lecher Date: Mon, 19 Apr 2010 17:49:24 +0000 (+0000) Subject: resepect LDFLAGS, #316059 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=649f4f3b65f1e07036e62c1261c316890f760bdc;p=gentoo.git resepect LDFLAGS, #316059 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/sci-chemistry/mead/ChangeLog b/sci-chemistry/mead/ChangeLog index 478d87319926..fc75f94f5ed3 100644 --- a/sci-chemistry/mead/ChangeLog +++ b/sci-chemistry/mead/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-chemistry/mead # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/ChangeLog,v 1.7 2010/04/19 07:02:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/ChangeLog,v 1.8 2010/04/19 17:49:23 jlec Exp $ + +*mead-2.2.7-r1 (19 Apr 2010) + + 19 Apr 2010; Justin Lecher mead-2.2.7.ebuild, + +mead-2.2.7-r1.ebuild, +files/mead-2.2.7-respect-flags.patch, + -files/respect-cflags.patch: + respect LDFLAGS, #316059 19 Apr 2010; Justin Lecher -mead-2.2.5.ebuild, mead-2.2.7.ebuild: diff --git a/sci-chemistry/mead/Manifest b/sci-chemistry/mead/Manifest index ea2cc7db0f04..89127cfe3a33 100644 --- a/sci-chemistry/mead/Manifest +++ b/sci-chemistry/mead/Manifest @@ -3,15 +3,16 @@ Hash: SHA1 AUX mead-2.2.7-gcc43.patch 469 RMD160 26b213e10918cd5cca859d231220a36d6d5d00d6 SHA1 37f2b71fe72a81a429b9ea9dff22edecd88c6c1b SHA256 00761d07cbe4445ba3fbccfaff23b43d2de133857181b242f60a9608841c91da AUX mead-2.2.7-respect-cflags.patch 2229 RMD160 da621223ba4ae992046f2ecf7877547c6c6d9285 SHA1 54b0d3cf3b460aaefbd47c4e1a92fc3cf75754df SHA256 a336e59311c312c15f636b9242fc1602b8d8b4662aeae869fdef8ed120170ba2 -AUX respect-cflags.patch 2202 RMD160 46983e0a9a550a1674f4f17125f1ba558c2d7ad3 SHA1 94e3f8b732def4ec3bd08e0f7270c91cdd3ee7dd SHA256 78cbb06d6857db50cb7680eb0e84e68a8042085067d6f70d0afc8ffa95b62e03 +AUX mead-2.2.7-respect-flags.patch 2391 RMD160 b458f32d43cd5cd5d3b5cadad2fca5dd4c6813cd SHA1 8e968d9067ca98d32da2bbb467ba5b548e86a449 SHA256 5e66caef6658208ab1f6d5344cab391baaf320709bdd18dfe03c3eb5e197938b DIST mead-2.2.7.tar.gz 806319 RMD160 9adf9743e44061779f9ac3b9064abb9164ad3e58 SHA1 6d3bbda29a5f8fdf26600e036ca8debacc37b90e SHA256 fd2a4b357bbd847ac9b255563034d7e71bf16cf59efa371d966b6fbbe9b4cd7c -EBUILD mead-2.2.7.ebuild 976 RMD160 fadab09c63555be8379aaba69dd7eb4159af7f34 SHA1 da3728cae6f43c6bc0b6a83ed78be24ad845bf1c SHA256 dd2d1cc956ca257707d04d941a075871380c32ca4c7f4908c89c9cc6167f65cc -MISC ChangeLog 1313 RMD160 446ec5c7af1a3a0a9274131b6c0a0ebfade07f2f SHA1 595d940c98a3456d8c520e8e6f29a858422fdccb SHA256 82214afb222db81e739c519ea977c532811ea858343cf20f06178cf5b2ed0d78 +EBUILD mead-2.2.7-r1.ebuild 978 RMD160 6a475d58e09c4d6cda81a7ddbf25aaf8431de0d3 SHA1 476d758beff90ee839ed63bef2c34f26e8d14ddc SHA256 f0e8727755e25002d969eaeeab4bcb19537f0c6e28e634c82b267fbb69c49a79 +EBUILD mead-2.2.7.ebuild 975 RMD160 2b9bfcc9d188387f35d212c0c91095412c06c0b2 SHA1 0b1eb295a6044344488ea389afe61a5a14072192 SHA256 6e5596a19fba503992ff6b168bf2486392461199efbe879d3a509ea2087d4e77 +MISC ChangeLog 1532 RMD160 6d78ced3cc4c509ec2bd2eadeb52b553edf3269f SHA1 e8943671df9278ec2199c71be00e381b34e20dc3 SHA256 f35739d64d7584a46e03b498bb29b2f6caf9981e493abea94ebda165c0fec9d7 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkvMAAIACgkQgAnW8HDreRZTrQCfVBDS2PIoASe81t5+iQKOJJ0E -838AnRBQGQ5K/4FFQnr81DzU9t1R0Sv8 -=j7ok +iEYEARECAAYFAkvMl6sACgkQgAnW8HDreRZB6QCfYhs9QnzI1FrZRJtgjEGeG7Ox +xxkAoNNGszsdjN+rz8PXJzls5Da8cE2m +=wqLM -----END PGP SIGNATURE----- diff --git a/sci-chemistry/mead/files/mead-2.2.7-respect-flags.patch b/sci-chemistry/mead/files/mead-2.2.7-respect-flags.patch new file mode 100644 index 000000000000..9ffb238ece8c --- /dev/null +++ b/sci-chemistry/mead/files/mead-2.2.7-respect-flags.patch @@ -0,0 +1,74 @@ +diff --git a/apps/Makefile.common.in b/apps/Makefile.common.in +index 15c61ae..f15d71d 100644 +--- a/apps/Makefile.common.in ++++ b/apps/Makefile.common.in +@@ -36,10 +36,10 @@ REGEX_CPP = @REGEX_CPP@ + LIBS = @LIBS@ -lm + + ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) +-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) +-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) ++ALL_CXXFLAGS = @CXXFLAGS@ ++ALL_CFLAGS = @CFLAGS@ + +-CXXLINK = $(CXX) $(ALL_CPPFLAGS) $(CXX_DEBUGFLAGS) $(CXX_OPTFLAGS) \ ++CXXLINK = $(CXX) $(ALL_CPPFLAGS) @CXXFLAGS@ \ + $(LDFLAGS) + + .SUFFIXES: .cc .o +diff --git a/apps/libmso/Makefile.in b/apps/libmso/Makefile.in +index 249c25b..9d23665 100644 +--- a/apps/libmso/Makefile.in ++++ b/apps/libmso/Makefile.in +@@ -35,8 +35,8 @@ INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + + ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) +-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) +-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) ++ALL_CXXFLAGS = @CXXFLAGS@ ++ALL_CFLAGS = @CFLAGS@ + + .SUFFIXES: + .SUFFIXES: .cc .o +diff --git a/apps/redti/Makefile.in b/apps/redti/Makefile.in +index c4aa5ca..9561bf3 100644 +--- a/apps/redti/Makefile.in ++++ b/apps/redti/Makefile.in +@@ -21,7 +21,7 @@ CFLAGS = @CFLAGS@ + redti_objs = redti.o rfixpro.o rfixprosee.o pfix.o tc.o + + redti : $(redti_objs) +- $(CC) $(CFLAGS) $(redti_objs) -lm -o redti ++ $(CC) $(CFLAGS) $(LDFLAGS) $(redti_objs) -lm -o redti + + appname = redti + include ../Makefile.common +diff --git a/libmead/Makefile.in b/libmead/Makefile.in +index 3d4d5f0..8b4a4ac 100644 +--- a/libmead/Makefile.in ++++ b/libmead/Makefile.in +@@ -99,8 +99,8 @@ PYTHONINC = @PYTHONINC@ + INCLUDES = -I$(top_srcdir) + + ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) +-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) $(CXX_SHAREDFLAGS) +-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) ++ALL_CXXFLAGS = @CXXFLAGS@ ++ALL_CFLAGS = @CFLAGS@ + + + +diff --git a/swig/Makefile.in b/swig/Makefile.in +index 81b3b4e..8410307 100644 +--- a/swig/Makefile.in ++++ b/swig/Makefile.in +@@ -58,7 +58,7 @@ CPP_FLAGS = -DSWIG @CPPFLAGS@ + CXX_FLAGS = @CXX_NOOPTFLAGS@ @CXX_DEBUGFLAGS@ @CXX_SHAREDFLAGS@ + CXX_DYNLIB_FLAGS = @CXX_DYNLIB_FLAGS@ + +-ALL_CXXFLAGS = $(CPP_FLAGS) $(CXX_FLAGS) ++ALL_CXXFLAGS = $(CPP_FLAGS) @CXXFLAGS@ @CXX_SHAREDFLAGS@ + + MEADINC = -I$(top_srcdir) -I$(srcdir) + MEADLIBS = -L../libmead -lmead diff --git a/sci-chemistry/mead/files/respect-cflags.patch b/sci-chemistry/mead/files/respect-cflags.patch deleted file mode 100644 index 5b982aaebb4b..000000000000 --- a/sci-chemistry/mead/files/respect-cflags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur mead-2.2.5.orig/apps/libmso/Makefile.in mead-2.2.5/apps/libmso/Makefile.in ---- mead-2.2.5.orig/apps/libmso/Makefile.in 2004-12-10 12:33:49.000000000 -0800 -+++ mead-2.2.5/apps/libmso/Makefile.in 2005-12-17 12:43:10.000000000 -0800 -@@ -35,8 +35,8 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - - ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) --ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) --ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) -+ALL_CXXFLAGS = @CXXFLAGS@ -+ALL_CFLAGS = @CFLAGS@ - - .SUFFIXES: - .SUFFIXES: .cc .o -diff -ur mead-2.2.5.orig/apps/Makefile.common.in mead-2.2.5/apps/Makefile.common.in ---- mead-2.2.5.orig/apps/Makefile.common.in 2004-11-19 14:49:56.000000000 -0800 -+++ mead-2.2.5/apps/Makefile.common.in 2005-12-17 12:38:33.000000000 -0800 -@@ -36,10 +36,10 @@ - LIBS = @LIBS@ -lm - - ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) --ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) --ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) -+ALL_CXXFLAGS = @CXXFLAGS@ -+ALL_CFLAGS = @CFLAGS@ - --CXXLINK = $(CXX) $(ALL_CPPFLAGS) $(CXX_DEBUGFLAGS) $(CXX_OPTFLAGS) \ -+CXXLINK = $(CXX) $(ALL_CPPFLAGS) @CXXFLAGS@ \ - $(LDFLAGS) - - .SUFFIXES: .cc .o -diff -ur mead-2.2.5.orig/libmead/Makefile.in mead-2.2.5/libmead/Makefile.in ---- mead-2.2.5.orig/libmead/Makefile.in 2004-12-10 13:14:40.000000000 -0800 -+++ mead-2.2.5/libmead/Makefile.in 2005-12-17 12:40:12.000000000 -0800 -@@ -99,8 +99,8 @@ - INCLUDES = -I$(top_srcdir) - - ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) --ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) --ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) -+ALL_CXXFLAGS = @CXXFLAGS@ -+ALL_CFLAGS = @CFLAGS@ - - - -diff -ur mead-2.2.5.orig/swig/Makefile.in mead-2.2.5/swig/Makefile.in ---- mead-2.2.5.orig/swig/Makefile.in 2004-12-09 10:37:41.000000000 -0800 -+++ mead-2.2.5/swig/Makefile.in 2005-12-17 12:51:47.000000000 -0800 -@@ -58,7 +58,7 @@ - CXX_FLAGS = @CXX_NOOPTFLAGS@ @CXX_DEBUGFLAGS@ @CXX_SHAREDFLAGS@ - CXX_DYNLIB_FLAGS = @CXX_DYNLIB_FLAGS@ - --ALL_CXXFLAGS = $(CPP_FLAGS) $(CXX_FLAGS) -+ALL_CXXFLAGS = $(CPP_FLAGS) @CXXFLAGS@ @CXX_SHAREDFLAGS@ - - MEADINC = -I$(top_srcdir) -I$(srcdir) - MEADLIBS = -L../libmead -lmead diff --git a/sci-chemistry/mead/mead-2.2.7-r1.ebuild b/sci-chemistry/mead/mead-2.2.7-r1.ebuild new file mode 100644 index 000000000000..fe7e92af18ce --- /dev/null +++ b/sci-chemistry/mead/mead-2.2.7-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/mead-2.2.7-r1.ebuild,v 1.1 2010/04/19 17:49:23 jlec Exp $ + +inherit eutils + +DESCRIPTION="Macroscopic Electrostatics with Atomic Detail" +HOMEPAGE="http://www.teokem.lu.se/~ulf/Methods/mead.html" +SRC_URI="ftp://ftp.scripps.edu/pub/bashford/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +IUSE="python" + +RESTRICT="fetch" + +pkg_nofetch() { + elog "Download ${SRC_URI}" + elog "and place it in ${DISTDIR}." + elog + elog "Use \"anonymous\" as a login, and an email address as a password." +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-respect-flags.patch + epatch "${FILESDIR}"/${P}-gcc43.patch +} + +src_compile() { + econf \ + ${conf_opts} \ + || die "configure failed" + emake || die "make failed" +} + +src_install() { + # package hates emake DESTDIR="${D}" install + einstall || die "install failed" +} diff --git a/sci-chemistry/mead/mead-2.2.7.ebuild b/sci-chemistry/mead/mead-2.2.7.ebuild index 1d835c53b78b..44c0d212f06a 100644 --- a/sci-chemistry/mead/mead-2.2.7.ebuild +++ b/sci-chemistry/mead/mead-2.2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/mead-2.2.7.ebuild,v 1.2 2010/04/19 07:02:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mead/mead-2.2.7.ebuild,v 1.3 2010/04/19 17:49:23 jlec Exp $ inherit eutils @@ -27,7 +27,7 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-respect-cflags.patch + epatch "${FILESDIR}"/${P}-respect-flags.patch epatch "${FILESDIR}"/${P}-gcc43.patch }