| 1 |
jer 14/05/25 13:01:33 |
| 2 |
|
| 3 |
Modified: notion-9999.ebuild ChangeLog |
| 4 |
notion-3_p2013030200.ebuild |
| 5 |
Log: |
| 6 |
Reflect upstream system-autodetect.mk changes in sed scripts. Run configuration changes in src_configure(). |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.8 x11-wm/notion/notion-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?rev=1.8&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?rev=1.8&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?r1=1.7&r2=1.8 |
| 16 |
|
| 17 |
Index: notion-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v |
| 20 |
retrieving revision 1.7 |
| 21 |
retrieving revision 1.8 |
| 22 |
diff -u -r1.7 -r1.8 |
| 23 |
--- notion-9999.ebuild 29 May 2013 06:32:20 -0000 1.7 |
| 24 |
+++ notion-9999.ebuild 25 May 2014 13:01:33 -0000 1.8 |
| 25 |
@@ -1,13 +1,13 @@ |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation |
| 27 |
+# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.7 2013/05/29 06:32:20 xmw Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.8 2014/05/25 13:01:33 jer Exp $ |
| 31 |
|
| 32 |
-EAPI="4" |
| 33 |
+EAPI=5 |
| 34 |
|
| 35 |
EGIT_REPO_URI="git://notion.git.sourceforge.net/gitroot/notion/notion" |
| 36 |
EGIT_HAS_SUBMODULES="1" |
| 37 |
|
| 38 |
-inherit eutils git-2 toolchain-funcs multilib |
| 39 |
+inherit eutils git-2 multilib toolchain-funcs |
| 40 |
|
| 41 |
DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system" |
| 42 |
HOMEPAGE="http://notion.sourceforge.net" |
| 43 |
@@ -33,18 +33,22 @@ |
| 44 |
-e "/^CFLAGS/{s:-Os:: ; s:-g::}" \ |
| 45 |
-e "/^LDFLAGS=/{s:=:+=: ; s:-Wl,--as-needed::}" \ |
| 46 |
-e "/^CC=/s:=:?=:" \ |
| 47 |
- -e "s:^\(PREFIX=\).*$:\1${ROOT}usr:" \ |
| 48 |
- -e "s:^\(ETCDIR=\).*$:\1${ROOT}etc/notion:" \ |
| 49 |
- -e "s:^\(LIBDIR=\).*:\1\$(PREFIX)/$(get_libdir):" \ |
| 50 |
- -e "s:^\(DOCDIR=\).*:\1\$(PREFIX)/share/doc/${PF}:" \ |
| 51 |
- -e "s:^\(LUA_DIR=\).*$:\1\$(PREFIX)/usr:" \ |
| 52 |
- -e "s:^\(VARDIR=\).*$:\1${ROOT}var/cache/${PN}:" \ |
| 53 |
+ -e "/^PREFIX/s:=.*$:= \${ROOT}usr:" \ |
| 54 |
+ -e "/^ETCDIR/s:=.*$:= \${ROOT}etc/notion:" \ |
| 55 |
+ -e "/^LIBDIR/s:=.*:= \$(PREFIX)/$(get_libdir):" \ |
| 56 |
+ -e "/^DOCDIR/s:=.*:= \$(PREFIX)/share/doc/${PF}:" \ |
| 57 |
+ -e "/^LUA_DIR/s:=.*$:= \$(PREFIX)/usr:" \ |
| 58 |
+ -e "/^VARDIR/s:=.*$:= \${ROOT}var/cache/${PN}:" \ |
| 59 |
-e "s:^\(X11_PREFIX=\).*:\1\$(PREFIX)/usr:" \ |
| 60 |
-i system-autodetect.mk || die |
| 61 |
sed -e 's/gcc/$(CC)/g' \ |
| 62 |
-i ioncore/Makefile || die |
| 63 |
export STRIPPROG=true |
| 64 |
|
| 65 |
+ tc-export CC |
| 66 |
+} |
| 67 |
+ |
| 68 |
+src_configure() { |
| 69 |
use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT" |
| 70 |
|
| 71 |
if ! use xinerama ; then |
| 72 |
@@ -54,8 +58,6 @@ |
| 73 |
if ! use xrandr ; then |
| 74 |
sed -e 's/mod_xrandr//g' -i modulelist.mk || die |
| 75 |
fi |
| 76 |
- |
| 77 |
- tc-export CC |
| 78 |
} |
| 79 |
|
| 80 |
src_compile() { |
| 81 |
@@ -64,7 +66,7 @@ |
| 82 |
} |
| 83 |
|
| 84 |
src_install() { |
| 85 |
- emake DESTDIR="${D}" install |
| 86 |
+ default |
| 87 |
|
| 88 |
exeinto /etc/X11/Sessions |
| 89 |
doexe "${FILESDIR}"/notion |
| 90 |
@@ -75,5 +77,5 @@ |
| 91 |
|
| 92 |
pkg_postinst() { |
| 93 |
elog "If you want notion to have an ability to view a file based on its" |
| 94 |
- elog "guessed MIME type you need 'run-mailcap' program in your system." |
| 95 |
+ elog "guessed MIME type you should emerge app-misc/run-mailcap." |
| 96 |
} |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.9 x11-wm/notion/ChangeLog |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?rev=1.9&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?rev=1.9&content-type=text/plain |
| 104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?r1=1.8&r2=1.9 |
| 105 |
|
| 106 |
Index: ChangeLog |
| 107 |
=================================================================== |
| 108 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v |
| 109 |
retrieving revision 1.8 |
| 110 |
retrieving revision 1.9 |
| 111 |
diff -u -r1.8 -r1.9 |
| 112 |
--- ChangeLog 21 Jul 2013 14:07:01 -0000 1.8 |
| 113 |
+++ ChangeLog 25 May 2014 13:01:33 -0000 1.9 |
| 114 |
@@ -1,6 +1,11 @@ |
| 115 |
# ChangeLog for x11-wm/notion |
| 116 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.8 2013/07/21 14:07:01 jer Exp $ |
| 118 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 119 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.9 2014/05/25 13:01:33 jer Exp $ |
| 120 |
+ |
| 121 |
+ 25 May 2014; Jeroen Roovers <jer@g.o> notion-3_p2013030200.ebuild, |
| 122 |
+ notion-9999.ebuild: |
| 123 |
+ Reflect upstream system-autodetect.mk changes in sed scripts. Run |
| 124 |
+ configuration changes in src_configure(). |
| 125 |
|
| 126 |
29 May 2013; Michael Weber <xmw@g.o> notion-3_p2013030200.ebuild, |
| 127 |
notion-9999.ebuild: |
| 128 |
|
| 129 |
|
| 130 |
|
| 131 |
1.4 x11-wm/notion/notion-3_p2013030200.ebuild |
| 132 |
|
| 133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild?rev=1.4&view=markup |
| 134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild?rev=1.4&content-type=text/plain |
| 135 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild?r1=1.3&r2=1.4 |
| 136 |
|
| 137 |
Index: notion-3_p2013030200.ebuild |
| 138 |
=================================================================== |
| 139 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v |
| 140 |
retrieving revision 1.3 |
| 141 |
retrieving revision 1.4 |
| 142 |
diff -u -r1.3 -r1.4 |
| 143 |
--- notion-3_p2013030200.ebuild 29 May 2013 06:32:20 -0000 1.3 |
| 144 |
+++ notion-3_p2013030200.ebuild 25 May 2014 13:01:33 -0000 1.4 |
| 145 |
@@ -1,10 +1,10 @@ |
| 146 |
-# Copyright 1999-2013 Gentoo Foundation |
| 147 |
+# Copyright 1999-2014 Gentoo Foundation |
| 148 |
# Distributed under the terms of the GNU General Public License v2 |
| 149 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v 1.3 2013/05/29 06:32:20 xmw Exp $ |
| 150 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v 1.4 2014/05/25 13:01:33 jer Exp $ |
| 151 |
|
| 152 |
-EAPI="4" |
| 153 |
+EAPI=5 |
| 154 |
|
| 155 |
-inherit eutils toolchain-funcs multilib |
| 156 |
+inherit eutils multilib toolchain-funcs |
| 157 |
|
| 158 |
DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system" |
| 159 |
HOMEPAGE="http://notion.sourceforge.net" |
| 160 |
@@ -45,6 +45,10 @@ |
| 161 |
-i ioncore/Makefile || die |
| 162 |
export STRIPPROG=true |
| 163 |
|
| 164 |
+ tc-export CC |
| 165 |
+} |
| 166 |
+ |
| 167 |
+src_configure() { |
| 168 |
use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT" |
| 169 |
|
| 170 |
if ! use xinerama ; then |
| 171 |
@@ -54,8 +58,6 @@ |
| 172 |
if ! use xrandr ; then |
| 173 |
sed -e 's/mod_xrandr//g' -i modulelist.mk || die |
| 174 |
fi |
| 175 |
- |
| 176 |
- tc-export CC |
| 177 |
} |
| 178 |
|
| 179 |
src_compile() { |
| 180 |
@@ -64,7 +66,7 @@ |
| 181 |
} |
| 182 |
|
| 183 |
src_install() { |
| 184 |
- emake DESTDIR="${D}" install |
| 185 |
+ default |
| 186 |
|
| 187 |
exeinto /etc/X11/Sessions |
| 188 |
doexe "${FILESDIR}"/notion |
| 189 |
@@ -75,5 +77,5 @@ |
| 190 |
|
| 191 |
pkg_postinst() { |
| 192 |
elog "If you want notion to have an ability to view a file based on its" |
| 193 |
- elog "guessed MIME type you need 'run-mailcap' program in your system." |
| 194 |
+ elog "guessed MIME type you should emerge app-misc/run-mailcap." |
| 195 |
} |
Archives