Reflect upstream system-autodetect.mk changes in sed scripts. Run configuration changes in src_configure().

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 40 insertions, 31 deletions

diff --git a/x11-wm/notion/ChangeLog b/x11-wm/notion/ChangeLog
index 6a91eb85384d..466dde126638 100644
--- a/x11-wm/notion/ChangeLog
+++ b/x11-wm/notion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/notion
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.8 2013/07/21 14:07:01 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.9 2014/05/25 13:01:33 jer Exp $
+
+  25 May 2014; Jeroen Roovers <jer@gentoo.org> notion-3_p2013030200.ebuild,
+  notion-9999.ebuild:
+  Reflect upstream system-autodetect.mk changes in sed scripts. Run
+  configuration changes in src_configure().
 
   29 May 2013; Michael Weber <xmw@gentoo.org> notion-3_p2013030200.ebuild,
   notion-9999.ebuild:
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 6fa40dbbf4c3..ae3baeb6a114 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 AUX notion 26 SHA256 70ff05ede1d85ff4bf8d5100aa7ace3bb89ac09596543c6829fb1f65fddb546c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8 WHIRLPOOL 14d17193642b810671ee231b4e8a1f1664e21456203abe0a1f7f226497767f9505dbcfc09095ebc2d24c13a48b754bb225a16fd9092e06b5c51a22a8dae727e6
 AUX notion.desktop 223 SHA256 4581319c329385f0bc5c18fe0037a4820ab1650a3af7ffe403a87e7fe5bf0987 SHA512 1b56a51f251f48359a591ab315f9cfa16fa4634425262f1eb8844e1c91e6ef29f5bcc28d41572682c069adc48bbc3b6fdaf6b3bfc9885abcce468388970fed3f WHIRLPOOL add23c415745b461e0f2c168f10ad2a1de97b473984a3e1cbb66c4d3cf2e8239fbd921954544ae38e6fef72adf6ccb224749e7bfde35495f89d6fa20b87c1016
 DIST notion-3-2013030200-src.tar.bz2 625211 SHA256 565d85757cf5aac0193498339d245d3fd34dff09a1f2816735cae584a5b863e7 SHA512 266df9ca2f3613c7138a3bfe7bab1fadd27c1ad40078d134be827167b9407b900bc240780cb5375e6996777978bb8a3bc12fbfa45bb4d8d619ee93335c6039b2 WHIRLPOOL 23831d187dc23bffb83965015c0d052cb4a7378c6599dfac0d0fb845e624e7dd934be7a2a1e6bb8598330d9fbf621cc346986baeff3d96b16018774a116f7dd0
-EBUILD notion-3_p2013030200.ebuild 2061 SHA256 0ae645f6868fc91dd5e609a2613ad3e500d8a976fdf7e50c6e4a053c984f4fa2 SHA512 b3b8dfdcd362548c47dbf3a68f1c37189c388b5374205ff2a41eba7826829ab5c6190f068605d7702c28c47eebbc58d8c57dd2a5ffa400726e1e7f6f03e9a846 WHIRLPOOL 6df5055653b2b7aa1cb327da541cc4e89c6e327f3d50297967692360745d23b30509e7cc95a8db4dae28201bc583e6ea5ed7b751defe8fc49edda7dd5419ebb3
-EBUILD notion-9999.ebuild 2054 SHA256 3990d7d7a8339412f281c62403fa5b7143913b6f120a6848a2f2a02e0149d2b5 SHA512 579b8912f77c88ecc5c15bcca7fcbbbd3473ea9e0a697cdc0d799aa253a84d0a1e7f51d8568a9daf1ae5a7f0a33abf2f3c83e092984d71760b0a75fab008810d WHIRLPOOL 348115123bed8c5f9782f8702fec5c011251d2b4b2b32d70b72d29638f2dc5bcd8d860b4f5df74c561c2e115156f40f317c4a7205a60f61ed4584d19c6e8c923
-MISC ChangeLog 1251 SHA256 5bd8c44c50cba560af042cb938c12a62231ff39fba78dd1e2228f4bbddbeb9e2 SHA512 f8926fff55cd5c874853c5514da958d494a159d1dc07a44cf19e7252d5cabeb396cff6ad41e986fa95dbd599bc2238c96c85aa4906ed0ecab31a4a2f4489763b WHIRLPOOL 36319196c9d816341b503184b0190358acc5866e653317bf473fcbb210cf53ba506120c5f44e972990264dbabf0cb480477e8df749f705f37a8b64640ae655b6
+EBUILD notion-3_p2013030200.ebuild 2051 SHA256 a28f2e38b6ace1dc14e45d271c9a9c6f96777cf7ced769a3a85558b25099d205 SHA512 8fedb9e21757fd4625c30c9530ece8d5cc5816a81eb1de6db2bf8eafc763a5bb51c4cba02d45e0abd28046e0de67f89c2b7ce5aa41b3da7f15f580010f87e7e1 WHIRLPOOL 6f265b66f8483ea9613fed2a29e788c7b023b8962469a6a1e62d27e84c3a22cda148a499ee3f761757fa28a28eeb4a11de961552b859ac8bc5cbee569ade6659
+EBUILD notion-9999.ebuild 2035 SHA256 b22a25560cae0105bf205deb87ffafe607a644073ad2c74011a82e6e243d9831 SHA512 cb04617e295abe2b1621a47cb3e35cf1eca5cf4198da9896308a8ec469fde7145c0b7b58d158407b69a460134a0ce98c712e966d70c68d0b5e5b82f5a2dac05a WHIRLPOOL 2433dafab783b27a3272f15662dc93f6ad610dd5859faa0822071dea364c87738de1bb36e0867aed2d198932bc95ed24632b19d0e024272e06404cf85edcc1e5
+MISC ChangeLog 1462 SHA256 eba99d8e92ddc5f2c213b14c89e1f6ace55ce100453989f15293fc0e04eaafaa SHA512 6252a14e6869c1b1d830427a923ecb9bf64db3ea8bb4e5f91c4a8d93ead1c3b656419019f25ba630352ab45ad8c2a1cec5375b56cef4015012160ed777d30c09 WHIRLPOOL 81dd3f7f5ab54d800cbf7abf7b456a396ac7306f2adc0fb709b0ec57b81102ac8b5e8ea51e8af1c970bc978bdeff7a9e1d6d6884de4feb317bf42c2fdfe6ef8e
 MISC metadata.xml 389 SHA256 2cc3ed5cb02d5c131bf6359fcc0cb1462901910f0b6ec9ecbef47218b8294c2c SHA512 cbfda39d4349e4d32727feb6c31026dee64d53a1701c9214201a14dea45073967ab864303432ee2643ed9e2694ff286e860076792613207893bea8484fd8f38e WHIRLPOOL 1633d23e57afe62cb87f3dfea5bede3c8665c8422f37188e4070fd9a3eada6f8152bbb1770cc06678bce7028c084a1f318dfd1421c6343f1df9aba5d115c7388
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHr6wYACgkQVWmRsqeSphP2xQCeKR2KmxYRhazUr91lS+8IDVTR
-LT8An2uttb/aQ3FrZxTnn8mNqjMy887a
-=WS+u
+iEYEAREIAAYFAlOB6a8ACgkQVWmRsqeSphO69ACffI+clYe3H8mhBe8ajTZXrrpN
+PgYAn2FZVOuKgtCnSBYv7bsQV9lzGr+v
+=R/eJ
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/notion/notion-3_p2013030200.ebuild b/x11-wm/notion/notion-3_p2013030200.ebuild
index e4d542361250..7523730dd4b1 100644
--- a/x11-wm/notion/notion-3_p2013030200.ebuild
+++ b/x11-wm/notion/notion-3_p2013030200.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v 1.3 2013/05/29 06:32:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v 1.4 2014/05/25 13:01:33 jer Exp $
 
-EAPI="4"
+EAPI=5
 
-inherit eutils toolchain-funcs multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
 HOMEPAGE="http://notion.sourceforge.net"
@@ -45,6 +45,10 @@ src_prepare() {
 		-i ioncore/Makefile || die
 	export STRIPPROG=true
 
+	tc-export CC
+}
+
+src_configure() {
 	use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT"
 
 	if ! use xinerama ; then
@@ -54,8 +58,6 @@ src_prepare() {
 	if ! use xrandr ; then
 		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
 	fi
-
-	tc-export CC
 }
 
 src_compile() {
@@ -64,7 +66,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/notion
@@ -75,5 +77,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you want notion to have an ability to view a file based on its"
-	elog "guessed MIME type you need 'run-mailcap' program in your system."
+	elog "guessed MIME type you should emerge app-misc/run-mailcap."
 }
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 560c8fa573f1..1dc764b625ee 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.7 2013/05/29 06:32:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.8 2014/05/25 13:01:33 jer Exp $
 
-EAPI="4"
+EAPI=5
 
 EGIT_REPO_URI="git://notion.git.sourceforge.net/gitroot/notion/notion"
 EGIT_HAS_SUBMODULES="1"
 
-inherit eutils git-2 toolchain-funcs multilib
+inherit eutils git-2 multilib toolchain-funcs
 
 DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
 HOMEPAGE="http://notion.sourceforge.net"
@@ -33,18 +33,22 @@ src_prepare() {
 		-e "/^CFLAGS/{s:-Os:: ; s:-g::}" \
 		-e "/^LDFLAGS=/{s:=:+=: ; s:-Wl,--as-needed::}" \
 		-e "/^CC=/s:=:?=:" \
-		-e "s:^\(PREFIX=\).*$:\1${ROOT}usr:" \
-		-e "s:^\(ETCDIR=\).*$:\1${ROOT}etc/notion:" \
-		-e "s:^\(LIBDIR=\).*:\1\$(PREFIX)/$(get_libdir):" \
-		-e "s:^\(DOCDIR=\).*:\1\$(PREFIX)/share/doc/${PF}:" \
-		-e "s:^\(LUA_DIR=\).*$:\1\$(PREFIX)/usr:" \
-		-e "s:^\(VARDIR=\).*$:\1${ROOT}var/cache/${PN}:" \
+		-e "/^PREFIX/s:=.*$:= \${ROOT}usr:" \
+		-e "/^ETCDIR/s:=.*$:= \${ROOT}etc/notion:" \
+		-e "/^LIBDIR/s:=.*:= \$(PREFIX)/$(get_libdir):" \
+		-e "/^DOCDIR/s:=.*:= \$(PREFIX)/share/doc/${PF}:" \
+		-e "/^LUA_DIR/s:=.*$:= \$(PREFIX)/usr:" \
+		-e "/^VARDIR/s:=.*$:= \${ROOT}var/cache/${PN}:" \
 		-e "s:^\(X11_PREFIX=\).*:\1\$(PREFIX)/usr:" \
 		-i system-autodetect.mk || die
 	sed -e 's/gcc/$(CC)/g' \
 		-i ioncore/Makefile || die
 	export STRIPPROG=true
 
+	tc-export CC
+}
+
+src_configure() {
 	use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT"
 
 	if ! use xinerama ; then
@@ -54,8 +58,6 @@ src_prepare() {
 	if ! use xrandr ; then
 		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
 	fi
-
-	tc-export CC
 }
 
 src_compile() {
@@ -64,7 +66,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/notion
@@ -75,5 +77,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you want notion to have an ability to view a file based on its"
-	elog "guessed MIME type you need 'run-mailcap' program in your system."
+	elog "guessed MIME type you should emerge app-misc/run-mailcap."
 }