From: Danny van Dyk Date: Sun, 25 Mar 2007 02:58:30 +0000 (+0000) Subject: QA: Fixed assignment of CFLAGS. Makefile respects CXXFLAGS now. Fixed include and... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2713b1b46005810acfc3d0da116f31b7b708b1a9;p=gentoo.git QA: Fixed assignment of CFLAGS. Makefile respects CXXFLAGS now. Fixed include and library paths. Package-Manager: portage-2.1.2.1-r1 --- diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog index fc6069d8d379..07f83385f0d9 100644 --- a/sci-biology/seaview/ChangeLog +++ b/sci-biology/seaview/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-biology/seaview # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.9 2007/02/22 01:30:19 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.10 2007/03/25 02:58:30 kugelfang Exp $ + + 25 Mar 2007; Danny van Dyk seaview-20041220.ebuild, + seaview-20060213.ebuild: + QA: Fixed assignment of CFLAGS. Makefile respects CXXFLAGS now. Fixed + include and library paths. 22 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/sci-biology/seaview/Manifest b/sci-biology/seaview/Manifest index 0e84aeae69bd..3e9388e4fc98 100644 --- a/sci-biology/seaview/Manifest +++ b/sci-biology/seaview/Manifest @@ -3,18 +3,18 @@ Hash: SHA1 DIST seaview-20041220.tar.bz2 115192 RMD160 a557e906c9115db74ddfdecc4fdc647df336b3c3 SHA1 f237a7ccc0ba7e69c6b61a6aaac4ae4d0be12c71 SHA256 045b09e08d49f9630243e3bc19d8cc630874e1c4f64a1d91997e76e5af2cd6d7 DIST seaview-20060213.tar.bz2 114995 RMD160 c3409b5e06f15e983db4912812381ee5d5894ea9 SHA1 6dffddf934e82eb155e47dcd58f9a5612511fcff SHA256 be058f53f07cec46978f10ddad8794bbe79762cf089d18b5cbe7cb6ed15c54fc -EBUILD seaview-20041220.ebuild 882 RMD160 76a5d3e970c20d034ac831a7b01c7665e4450bc8 SHA1 e5155acaa8b728a9599557dff1a3d772d3acdfba SHA256 bfd3296f1250f436767fe8ab774d9e4de08febd201e61fe7515f120fff98fc3d -MD5 680ece30974abad6f113a0f92824ea23 seaview-20041220.ebuild 882 -RMD160 76a5d3e970c20d034ac831a7b01c7665e4450bc8 seaview-20041220.ebuild 882 -SHA256 bfd3296f1250f436767fe8ab774d9e4de08febd201e61fe7515f120fff98fc3d seaview-20041220.ebuild 882 -EBUILD seaview-20060213.ebuild 912 RMD160 c9f5472b0b098ebcd7a4984fbb90c00eb886478e SHA1 40b137e42364fbaec51d38d87b7fb874aae05a1f SHA256 5a60af1cf1603a3054362ee031bb6844b49a7af9a5a0d2e52f4140c547055af9 -MD5 bb7e5c881522e18af3c3376bed076d10 seaview-20060213.ebuild 912 -RMD160 c9f5472b0b098ebcd7a4984fbb90c00eb886478e seaview-20060213.ebuild 912 -SHA256 5a60af1cf1603a3054362ee031bb6844b49a7af9a5a0d2e52f4140c547055af9 seaview-20060213.ebuild 912 -MISC ChangeLog 2162 RMD160 bc02c0e827f05bc34afe132967006e17598bfe82 SHA1 a32032d11a08ad65996a36110a296d71a598289c SHA256 cb3531af39ad90e677cb98a98cd834f5e42ef6973b716766234262755a5ab730 -MD5 4f3ebb70598794065ac66b35543f1218 ChangeLog 2162 -RMD160 bc02c0e827f05bc34afe132967006e17598bfe82 ChangeLog 2162 -SHA256 cb3531af39ad90e677cb98a98cd834f5e42ef6973b716766234262755a5ab730 ChangeLog 2162 +EBUILD seaview-20041220.ebuild 1252 RMD160 796c3c1e87e6e6d045c636c5b9f46c006fefdbab SHA1 3d3dc29ce2ed97177fce7c7cbabfc9b38a0cf09f SHA256 3f7f4696d6f8b0a31d001348668b340b0c061cb1b5ee8bba21b43ea29fd559c0 +MD5 0a7c5d307616c678a1ae66aaaf8cdf74 seaview-20041220.ebuild 1252 +RMD160 796c3c1e87e6e6d045c636c5b9f46c006fefdbab seaview-20041220.ebuild 1252 +SHA256 3f7f4696d6f8b0a31d001348668b340b0c061cb1b5ee8bba21b43ea29fd559c0 seaview-20041220.ebuild 1252 +EBUILD seaview-20060213.ebuild 1279 RMD160 46c272125a1017dc87b781542a1a01cf316f6b88 SHA1 7e625694afd1d28f793da360d5d37a9dc40639ec SHA256 df51210b442efad6e33a5aec8adc97e62a65735a63208b5838d3d453c617c108 +MD5 24cce21a5ee705fdf1cdf6025e885419 seaview-20060213.ebuild 1279 +RMD160 46c272125a1017dc87b781542a1a01cf316f6b88 seaview-20060213.ebuild 1279 +SHA256 df51210b442efad6e33a5aec8adc97e62a65735a63208b5838d3d453c617c108 seaview-20060213.ebuild 1279 +MISC ChangeLog 2373 RMD160 cc5e305ded1453b9e2decb88936b0bc19369d459 SHA1 480b8787713f65108b196699aa4f83db76d42d64 SHA256 07b4dc11010e2954567314a33dff319c46d1e686472d0fab638ead48a35af71e +MD5 8b6e9f661d7e8fe62f16e464395269ab ChangeLog 2373 +RMD160 cc5e305ded1453b9e2decb88936b0bc19369d459 ChangeLog 2373 +SHA256 07b4dc11010e2954567314a33dff319c46d1e686472d0fab638ead48a35af71e ChangeLog 2373 MISC metadata.xml 622 RMD160 971008c946d3c492a86c946d8be5ed7881981600 SHA1 4a772f6c65f56de1a01eb770bc3b00998e8fc793 SHA256 a1d62029203598fbf7b1f3d97d004ff7fccf30246276ff8f9ba99b7696691529 MD5 62b43c9f7320b7c9c27eac02b2644cd5 metadata.xml 622 RMD160 971008c946d3c492a86c946d8be5ed7881981600 metadata.xml 622 @@ -28,7 +28,7 @@ SHA256 b91aecb8cac59c15a14b1e5f925c8b065f3a929f636adbea74e5331fbe4153e5 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFF3PHCz974XjDVpbkRAisvAJ4jPKx3/mLZpuRFhdRVWlzMClXrtACdEEnI -+kiGBpnVcdB1/Vi4BiPxS1E= -=V9g/ +iD8DBQFGBekI5mJXAu5GbtIRAnoyAJwOM2SJQFCksALPKrYVa8rDzIgQLwCfRiJS +6vNBRjzED8CRUaXW+XcdyhQ= +=RI2V -----END PGP SIGNATURE----- diff --git a/sci-biology/seaview/seaview-20041220.ebuild b/sci-biology/seaview/seaview-20041220.ebuild index bfd328d12000..5ca779cbce64 100644 --- a/sci-biology/seaview/seaview-20041220.ebuild +++ b/sci-biology/seaview/seaview-20041220.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20041220.ebuild,v 1.3 2005/04/24 13:17:54 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20041220.ebuild,v 1.4 2007/03/25 02:58:30 kugelfang Exp $ + +inherit toolchain-funcs multilib DESCRIPTION="A graphical multiple sequence alignment editor" HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html" @@ -14,13 +16,26 @@ IUSE="" DEPEND="x11-libs/fltk sci-biology/clustalw" -src_compile() { - # Corrects location of libfltk. - CFLAGS="${CFLAGS} -c -I/usr/include/fltk-1.1" - sed -i -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - sed -i -e 's:-L$(FLTK)/lib:-L/usr/lib/fltk-1.1:' Makefile || die +src_unpack() { + unpack ${A} + cd ${S} + + sed -i \ + -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - emake -e || die + # Respect CXXFLAGS. Package uses CFLAGS as CXXFLAGS. + # Fix invocation of C++ compiler. + # Fix include and library paths. + sed -i \ + -e '/^FLTK/d' \ + -e '/^X11/d' \ + -e "s:^CXX.*:CXX = $(tc-getCXX):" \ + -e 's:-I$(FLTK):-I/usr/include/fltk-1.1:' \ + -e 's:-I$(X11)/include:-I/usr/include/X11R6:' \ + -e "s:\(^CFLAGS .*\):\1 ${CXXFLAGS}:" \ + -e "s:-L\$(FLTK)/lib:-L/usr/$(get_libdir)/fltk-1.1:" \ + -e "s:-L\$(X11)/lib:-L/usr/$(get_libdir)/X11:" \ + Makefile || die } src_install() { diff --git a/sci-biology/seaview/seaview-20060213.ebuild b/sci-biology/seaview/seaview-20060213.ebuild index 2d9708b03041..b2563b0178fa 100644 --- a/sci-biology/seaview/seaview-20060213.ebuild +++ b/sci-biology/seaview/seaview-20060213.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20060213.ebuild,v 1.1 2006/03/08 00:11:54 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-20060213.ebuild,v 1.2 2007/03/25 02:58:30 kugelfang Exp $ + +inherit toolchain-funcs multilib DESCRIPTION="A graphical multiple sequence alignment editor" HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html" @@ -15,13 +17,26 @@ DEPEND="x11-libs/fltk =media-libs/pdflib-6.0* sci-biology/clustalw" -src_compile() { - # Corrects location of libfltk. - CFLAGS="${CFLAGS} -c -I/usr/include/fltk-1.1" - sed -i -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - sed -i -e 's:-L$(FLTK)/lib:-L/usr/lib/fltk-1.1:' Makefile || die +src_unpack() { + unpack ${A} + cd ${S} + + sed -i \ + -e "s%\"seaview.help\", %\"/usr/share/${PN}/seaview.help\", %" seaview.cxx || die - emake -e || die + # Respect CXXFLAGS. Package uses CFLAGS as CXXFLAGS. + # Fix invocation of C++ compiler. + # Fix include and library paths. + sed -i \ + -e '/^FLTK/d' \ + -e '/^X11/d' \ + -e "s:^CXX.*:CXX = $(tc-getCXX):" \ + -e 's:-I$(FLTK):-I/usr/include/fltk-1.1:' \ + -e 's:-I$(X11)/include:-I/usr/include/X11R6:' \ + -e "s:\(^CFLAGS .*\):\1 ${CXXFLAGS}:" \ + -e "s:-L\$(FLTK)/lib:-L/usr/$(get_libdir)/fltk-1.1:" \ + -e "s:-L\$(X11)/lib:-L/usr/$(get_libdir)/X11:" \ + Makefile || die } src_install() {