jer         14/05/25 13:01:33

  Modified:             notion-9999.ebuild ChangeLog
                        notion-3_p2013030200.ebuild
  Log:
  Reflect upstream system-autodetect.mk changes in sed scripts. Run 
configuration changes in src_configure().
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.8                  x11-wm/notion/notion-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?r1=1.7&r2=1.8

Index: notion-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- notion-9999.ebuild  29 May 2013 06:32:20 -0000      1.7
+++ notion-9999.ebuild  25 May 2014 13:01:33 -0000      1.8
@@ -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 @@
                -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 @@
        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_install() {
-       emake DESTDIR="${D}" install
+       default
 
        exeinto /etc/X11/Sessions
        doexe "${FILESDIR}"/notion
@@ -75,5 +77,5 @@
 
 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."
 }



1.9                  x11-wm/notion/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog   21 Jul 2013 14:07:01 -0000      1.8
+++ ChangeLog   25 May 2014 13:01:33 -0000      1.9
@@ -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 <[email protected]> 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 <[email protected]> notion-3_p2013030200.ebuild,
   notion-9999.ebuild:



1.4                  x11-wm/notion/notion-3_p2013030200.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild?r1=1.3&r2=1.4

Index: notion-3_p2013030200.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notion-3_p2013030200.ebuild 29 May 2013 06:32:20 -0000      1.3
+++ notion-3_p2013030200.ebuild 25 May 2014 13:01:33 -0000      1.4
@@ -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 @@
                -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 @@
        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_install() {
-       emake DESTDIR="${D}" install
+       default
 
        exeinto /etc/X11/Sessions
        doexe "${FILESDIR}"/notion
@@ -75,5 +77,5 @@
 
 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."
 }




Reply via email to