sci-biology/seaview: Punt base.eclass; Bump EAPI to 5; add missing dep for pkg-config; Give some PREFIX love; use tc-getPKG_CONFIG instead of plain pkg-config

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 35 insertions, 21 deletions

diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog
index ff4ea021fe9c..bac995239f83 100644
--- a/sci-biology/seaview/ChangeLog
+++ b/sci-biology/seaview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/seaview
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.48 2013/03/11 16:57:16 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.49 2014/01/06 08:50:53 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> seaview-4.3.5.ebuild:
+  Punt base.eclass; Bump EAPI to 5; add missing dep for pkg-config; Give some
+  PREFIX love; use tc-getPKG_CONFIG instead of plain pkg-config
 
   11 Mar 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Drop Andrey as maintainer so that bugs get assigned to sci-biology directly
diff --git a/sci-biology/seaview/Manifest b/sci-biology/seaview/Manifest
index ed69b1f83af8..287194e16cb5 100644
--- a/sci-biology/seaview/Manifest
+++ b/sci-biology/seaview/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST seaview_4.3.3.tar.gz 313375 SHA256 632286397b4959ed8e379d6a6c57715a01634a81596ed681bcd87e14e10684b4 SHA512 cc3eb433c807b3482a4e883ffc96e00b8e04b6208561d3e7c7409da25e2171e5db7a0caa252070da904bd672d68f151967133ae0801fe2c6ffdee0d9af7ec8c3 WHIRLPOOL 0310a5e707c7314e3038a7e9467fa854868b691e7f4a82a75808ddf9197c8a98030414be67649c8b6def31a350899faa615c5d38a8f69966dc60080e51964915
 DIST seaview_4.3.5.tar.gz 309530 SHA256 38050d6792eb799d61e5e849f76971a9c7d45f467e5c04fbc4363062d8e7100d SHA512 b20c018da9a29d79fe0393fed5d29117729492ea8f36e72d4aeb98044a3de4a13331bd29e76ca552a08f6da764e57e69f9fb0325fc031551514d7a54b56c849a WHIRLPOOL 82fc7324bf1d934d69712629808d6b4178a5f2cdcf25351fb2fe2784f9cea0c1ec0aaaba7a3a08c84795108eb049394ceaab052af8cc0efbb0975064fa4e80e0
 EBUILD seaview-4.3.3.ebuild 2077 SHA256 ed87af157bc2ee08daff8b4933856091d07f51053425816beacde39b571cd2eb SHA512 c7a615730e29ff97d5d60f524014e91235ee6b157031f229dd6fc4f3bc0a39a3361bd380a96acdf9279a659da7a7563cd063c3607e94d14772aea0b2082727a8 WHIRLPOOL 9bb18a3d8cd243c238928f9bef5295b0283307a08d13999f2b0438000724e2bfc22017ad4b0ea03e36ecbde513f1bb8017c9c482f3feee8a9864f7a55e8136db
-EBUILD seaview-4.3.5.ebuild 2077 SHA256 5b21ea1f5d0f0f67146a62c535b47c844a1d95bbbea42d3e409256c69b528c76 SHA512 bee7427c44fce4d196255e47d74259669c6b2b388290dd32e0d4b545d51e2e36fbda03b532f4812b5dd8131a4deb9cb74dc092b3f70722deaa7516dd8853468b WHIRLPOOL a94ab02edf4f88a7d6a460091f67e2f56ffaa9972756651c8b3f4e1a0d5d498565d36549ea581adabc8922291403fbf122d5e29cfa3e1b5a6cde0638fb0838fd
-MISC ChangeLog 8091 SHA256 99242944c57e65a1516c7545ae105fca0c7fce192ec624c803e51cb32bf8858d SHA512 0af5c4cfea2e8d4bafa0e984597fbccfdbbb9d137b1fd50a3a21b1f09a1cba46757253127282fe6fb89e32ffc6ae55f600dbb8725a2647aad40a89372eb8fd58 WHIRLPOOL 02471f3fdd84fcd0e1706f42c8f9b9f179202c9af3f2a1cf48cf533b311c49f9019a874544e0611fb29a8cd35ea2024d007d5c2fecdbce23347d2b9ed03fd13c
+EBUILD seaview-4.3.5.ebuild 2133 SHA256 7f5b4e8404b81a6313c98d48ee3d22d957eeed8acbe8aadb32544ac19fc93fa4 SHA512 3beb220fcf0fbd78a61a2c82543274166374ab17b0418b188c217892e5072ce4d5571a5bcd6d64dbf6fd126c55bf4b08ebaff2cef45ec0db1d6678625a4653a0 WHIRLPOOL 996c11a9056e055e61e74b5b34c014bc7c0f62fc8c2d9e7910d8ad77998209fe6fde5cc26995f9e2e9bc0093d23bf3e6a751bfe2b7544f76afefc3c1a2860e14
+MISC ChangeLog 8303 SHA256 494e787242fdd53008730725f1ca3e1f03770542c4d339e3ba0811fb48296925 SHA512 0e7b2b0ef558a4bb144dfa301b7120b44e67a47c5d52e5971161d11cd9aca63debc3943026d836d136aab39af4f3d356710bf85b3fcb26ce37ffb03c6946bfbd WHIRLPOOL efe207f132a0bfb9887d784ac3aed09bdce0bf8968214308de8775df229993bf25d44f8fa2cd9a98c5fe4b9875a4852dd5090ac58b4f714b0c84e71836d34be2
 MISC metadata.xml 527 SHA256 48b9d9f18a3f5ffcef4ab6388dbc63debbbdbecef3636ff18a65142db5542d39 SHA512 7398c3188e6f2e31fce571a805823bc5058cff4834c85d822b50f51f52fd37659a1c80333a667986cd2ce530bc65aaf761615b6b34aa1877f87d92e47cb873a5 WHIRLPOOL 5c025aa29f1f6885f3caa94cceb31c362bc1ec5e7316bb6b4540977ded96bd63d1ff32646c89fc3548b5a71e3f5673e85c0ec11d186222bbc8f9c2f854e78850
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlE+DO0ACgkQgAnW8HDreRZpFACfYFUBttnGDl6H6lk7ADIz55Yz
-JjYAoIYEkhaqDgSDrpi0O2+xsYl35e51
-=Yow7
+iQIcBAEBCgAGBQJSym5uAAoJELnU8jG9FVirpukP/1C/Wwn6VTwV+tOwZgyAPY3l
+iWdLdSs9O9hKuud0YfFfOMmUKC0wvNdPkP8FIBy0YNkLNQq4l/nnYsVsOBqYoSPm
+/blpEaoyelWangicpJlpchn52RYbE2Ng7G1g0URdoday/IFsEDngaq14n+nZxFaa
+IjOSF0SOuhuV1rGe7FkNhLd2Z0vV8I5NJCgFXXyVYteVj7ltCkFfLFu481XKyi/U
+oaE2WM1gFd11YM67f6sj+OX03TwPcTQ9W7ZrhRGF0rh0qZsd0CioFCsXC75SAxWQ
+5DXnYwiANMxZmiSBMBH3B5NguO3IdvqLlW0IcfOVq+BkzutXu0JXRFYF3zb3Z+t6
+PAwA8Tlg0clfWN7B4Ctkj3sbIdQ3NtgwyrIOTsZyD+I7TMJt+PNRA3iXWOHXS+lP
+vn0Fi6A75TbdEcRdmBbRLxcScsNQDHijOzqsmrjjMZ9lHgtn124+scjaDixYGYm3
+aTJXJatqmsd8iwJRs0FFhWXg9fWjyrhMs9EnI8JLvYVmr1pLquPlQL2niB34zVyU
+iX3oXiXrm5GbRVYatnWayUaB67uuRyNisciftntMWk1oT4xV7ZOsO9KRAbScznEn
+MykJvl6Qks2XA/UVR+wE8O4L/gZ/txsgX5hR0IgNBkGkpxwWRUu9FKlRaqYMUdiQ
+YUReynCtanedZJNo0wYS
+=pOPw
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/seaview/seaview-4.3.5.ebuild b/sci-biology/seaview/seaview-4.3.5.ebuild
index a69a5f304a7c..fe3709f11b1d 100644
--- a/sci-biology/seaview/seaview-4.3.5.ebuild
+++ b/sci-biology/seaview/seaview-4.3.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.3.5.ebuild,v 1.3 2012/12/10 16:31:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.3.5.ebuild,v 1.4 2014/01/06 08:50:53 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit base eutils multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A graphical multiple sequence alignment editor"
 HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
@@ -15,17 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+xft"
 
-DEPEND="
+CDEPEND="
 	sys-libs/zlib
 	x11-libs/fltk:1
 	x11-libs/libX11
 	xft? (
 		x11-libs/libXft
 		x11-libs/fltk:1[xft] )"
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
 	sci-biology/clustalw
 	|| ( sci-libs/libmuscle sci-biology/muscle )
 	sci-biology/phyml"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}"
 
@@ -36,12 +38,12 @@ src_prepare() {
 		-e "s:^CXX.*:CXX = $(tc-getCXX):" \
 		-e "s:\$(OPT):${CXXFLAGS}:" \
 		-e "s:^OPT:#OPT:" \
-		-e "s:^FLTK = .*$:FLTK = /usr/include/fltk-1:" \
+		-e "s:^FLTK = .*$:FLTK = ${EPREFIX}/usr/include/fltk-1:" \
 		-e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \
 		-e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \
 		-e "s:^USE_XFT:#USE_XFT:" \
 		-e "s:^#HELPFILE:HELPFILE:" \
-		-e "s:/usr/share/doc/seaview/seaview.htm:/usr/share/seaview/seaview.htm:" \
+		-e "s:/usr/share/doc/seaview/seaview.htm:${EPREFIX}/usr/share/seaview/seaview.htm:" \
 		-e "s:^#PHYMLNAME:PHYMLNAME:" \
 		-e 's:-lXinerama::g' \
 		-e 's:-lpng::g' \
@@ -51,14 +53,12 @@ src_prepare() {
 
 	if use xft; then
 		sed \
-			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $(pkg-config --cflags xft):" \
-			-e "s:-lXft:$(pkg-config --libs xft):" \
+			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $($(tc-getPKG_CONFIG) --cflags xft):" \
+			-e "s:-lXft:$($(tc-getPKG_CONFIG) --libs xft):" \
 			-i Makefile || die "sed failed while editing Makefile to enable xft"
 	else
 		sed -i -e "s:-lXft::" Makefile || die
 	fi
-
-	base_src_prepare
 }
 
 src_install() {