5 files changed, 124 insertions, 23 deletions
diff --git a/x11-wm/notion/ChangeLog b/x11-wm/notion/ChangeLog
index ee2bd9b87a64..09e759b19c89 100644
--- a/x11-wm/notion/ChangeLog
+++ b/x11-wm/notion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/notion
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.12 2015/08/05 09:10:14 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.13 2015/08/05 10:09:07 xmw Exp $
+
+*notion-3_p2015061300 (05 Aug 2015)
+
+  05 Aug 2015; Michael Weber <xmw@gentoo.org> +notion-3_p2015061300.ebuild,
+  notion-3_p2013030200.ebuild, notion-9999.ebuild:
+  Version bump (bug 523566, p/r 160, thanks  John Mercier, Bailey Kong and
+  idella4).
 
   05 Aug 2015; Michael Weber <xmw@gentoo.org> metadata.xml:
   Dropping myself from maintainers
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 9387da3802ac..cb2c8e9699fa 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX notion 26 SHA256 70ff05ede1d85ff4bf8d5100aa7ace3bb89ac09596543c6829fb1f65fddb546c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8 WHIRLPOOL 14d17193642b810671ee231b4e8a1f1664e21456203abe0a1f7f226497767f9505dbcfc09095ebc2d24c13a48b754bb225a16fd9092e06b5c51a22a8dae727e6
 AUX notion.desktop 208 SHA256 c79e3d5d1f35f55ad2a11639339986363a4c23a839b6a58c7f9d5a307e1e05bc SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f WHIRLPOOL 820785e196965f4e589c2f4d5356d00e3c6b9685c49a06c6c1fba17fe41920ab0b6bf5a0e182ab0a970d380af41b806379ed050a742f88af8a9f7aadc7154848
 DIST notion-3-2013030200-src.tar.bz2 625211 SHA256 565d85757cf5aac0193498339d245d3fd34dff09a1f2816735cae584a5b863e7 SHA512 266df9ca2f3613c7138a3bfe7bab1fadd27c1ad40078d134be827167b9407b900bc240780cb5375e6996777978bb8a3bc12fbfa45bb4d8d619ee93335c6039b2 WHIRLPOOL 23831d187dc23bffb83965015c0d052cb4a7378c6599dfac0d0fb845e624e7dd934be7a2a1e6bb8598330d9fbf621cc346986baeff3d96b16018774a116f7dd0
-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 1775 SHA256 0ea77d6b0b5d1291e60487be55f3cbef79fdef0caa5b15f16598085bfe8a21f9 SHA512 010d35334e6f6064193a63c95c5c7ba116218f081feb5d44ef0ecc3cc51e0cf97ddde1c2fdafc68c5e8f9eed682b56448d4249b24fdb455fb073e64e6f217cc1 WHIRLPOOL afeb51abde22945e9141dcea450dd15e23ef43e054a907e878bfe1d4f07eb65d8c413e2a8b3fd6773545625ff7372d99b4798d6793d29e0b3b79d447c21fa738
+DIST notion-3_p2015061300.tar.gz 797057 SHA256 3c9d9f35a9fb0d17c263b76fe28f7a1a4a05b7d6140545524cc1effd98c5c305 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679 WHIRLPOOL 15263dd3298e90f0f16119198b01e1466acba7cf431d2d6a56e71f53b35a2461be7155462b31d9da6c0a652e8fd33b7b9fbf6960a64f956e9853ad3030e8bcb8
+EBUILD notion-3_p2013030200.ebuild 2118 SHA256 1363662525cf4b85af1946ad624b894d1793e499cbbfe009ae209eea3ef489af SHA512 7118d037af9af6edf823577532374306beba2455d1dd248ffe9fe5bc6a5d0d1c1d640ceb064db8466128c4c54a850074aef8f81a6075ce6cfdb08577c5817552 WHIRLPOOL a0b1f5c785b03fff0cb78751577921616274755a001e6860af850a6d3d0a2078663f1d9ac9c7da5eeafca0376d505119dabf42d6aa83bf27552b9b3bc426ce64
+EBUILD notion-3_p2015061300.ebuild 2183 SHA256 b39eb60ef7c5799bc3dfc1b58c69134eab6da548c2f1f346fe8e58b38f4cc872 SHA512 e43374fecea37053393be31cdcd0c23e3bd70019cdbeb3846e11e9bf9727319b63b0b134d961f9995ee4a392c76cbf5e0161f3e5bf96a28dfc1f340ec0ce3d25 WHIRLPOOL 776cdacc16c55b332288d722646860effc62d18be7f0fd3ac7a34eb486c5cbcebb40e059c3fecb8ea8c97cfeaee669031ae51b949bc6e0040f83640e8b618ed1
+EBUILD notion-9999.ebuild 2115 SHA256 cf06376189baef40f754ff77ee87c40f1a200cbe81da29a5e59579130d402869 SHA512 29b939f450ee9745b69c5ffadf957af22088223d6cd3f0c73e0a5164aa1308021137a9bf77c19db4a1d89ee87db75087dcc343cda4ed64e70a07dfd570da4409 WHIRLPOOL e0368d5beca5b74d0ea4aad5f829e386824c4826ec58bda4b795bfc98d6479456d1aed8a5af7ae15c0b398f8b5d7cf1bdd919644e2fa7b716e7b77cee200a16b
+MISC ChangeLog 2027 SHA256 7cd6b979cf08312584bbdda345cb6841d9dcc6bb66e0a92e00d0d855fddecfbe SHA512 08d72b20e0fb4b2de37a3d8b9b324f75af01fea003653602b132f889e51e8aa32622b6693ac309c96c1a82a00aac6a2c9a9a3107ba831348f23f3cb2265c14b0 WHIRLPOOL 81df44981589dfafc02ba2aaa4d95209de572ff0d2e3c581dccd3f58aac1e23ecede50cdffc1045b17b02817680b6281d7b3f8ad131d4c8b60277396fe3d21dc
 MISC metadata.xml 328 SHA256 fed41e15355ea75e6d821f3a5fc6fb1b725090a2867187c40f922e9e03ad0c8d SHA512 ccc6eee3d60632eb34cb80b88e48fe5d2b3b231f328f183c29fef7cea13a8d6b9552fb51f5444318aa38e495d8bdcb636b2ab23f6f3a538588381d73ee7d52f4 WHIRLPOOL 89eb1278a7427860a01922d72e836adce70106bce6d6e34acbfa7ce8aedbac975e8176dc6a50c09883e5dc1e18674dbcd5e8c933c066641f7a1613a3b60df5f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlXB0vcACgkQknrdDGLu8JAMLAD/V2mKWYVXGojT8sev7jqEwfQm
-msW/qnTBWDL7SvoKGiwBAIKAqi+tOcXRzoLbSemO0oFE2MDAGXjHeHOUs1T2XBIF
-=R7ny
+iF4EAREIAAYFAlXB4MQACgkQknrdDGLu8JCehwEAiz7xVuzE0+bGWMby/GirUNK4
+FekbNgE+oDoiouSoEFIA/RRbsSJlzxEgxHhyHUxvG5u5+XA6W+uqlAHL0NEaRZGK
+=3vwW
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/notion/notion-3_p2013030200.ebuild b/x11-wm/notion/notion-3_p2013030200.ebuild
index 7523730dd4b1..4c8efa5992a8 100644
--- a/x11-wm/notion/notion-3_p2013030200.ebuild
+++ b/x11-wm/notion/notion-3_p2013030200.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4 2014/05/25 13:01:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2013030200.ebuild,v 1.5 2015/08/05 10:09:07 xmw Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls xinerama +xrandr"
 
-RDEPEND="dev-lang/lua
+RDEPEND=">=dev-lang/lua-5.1:0=
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
@@ -26,6 +26,9 @@ RDEPEND="dev-lang/lua
 DEPEND="${RDEPEND}
 		virtual/pkgconfig"
 
+# needs luaposix,slingshot,... not in tree
+RESTRICT=test
+
 S=${WORKDIR}/${P/_p/-}
 
 src_prepare() {
diff --git a/x11-wm/notion/notion-3_p2015061300.ebuild b/x11-wm/notion/notion-3_p2015061300.ebuild
new file mode 100644
index 000000000000..868fc48a7bab
--- /dev/null
+++ b/x11-wm/notion/notion-3_p2015061300.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-3_p2015061300.ebuild,v 1.1 2015/08/05 10:09:07 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs flag-o-matic
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="http://notion.sourceforge.net"
+SRC_URI="https://github.com/raboof/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls xinerama +xrandr"
+
+RDEPEND=">=dev-lang/lua-5.1:0=
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+# needs luaposix,slingshot,... not in tree
+RESTRICT=test
+
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	append-cflags -D_DEFAULT_SOURCE
+
+	sed -e "/^CFLAGS=/s:=:+=:" \
+		-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 "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
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+}
+
+pkg_postinst() {
+	elog "If you want notion to have an ability to view a file based on its"
+	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 1dc764b625ee..39cc84d37815 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.8 2014/05/25 13:01:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.9 2015/08/05 10:09:07 xmw Exp $
 
 EAPI=5
 
-EGIT_REPO_URI="git://notion.git.sourceforge.net/gitroot/notion/notion"
-EGIT_HAS_SUBMODULES="1"
-
-inherit eutils git-2 multilib toolchain-funcs
+inherit eutils git-r3 multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
 HOMEPAGE="http://notion.sourceforge.net"
+EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="nls xinerama +xrandr"
 
-RDEPEND="dev-lang/lua
+RDEPEND=">=dev-lang/lua-5.1:0=
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
@@ -28,17 +26,22 @@ RDEPEND="dev-lang/lua
 DEPEND="${RDEPEND}
 		virtual/pkgconfig"
 
+# needs luaposix,slingshot,... not in tree
+RESTRICT=test
+
 src_prepare() {
+	append-cflags -D_DEFAULT_SOURCE
+
 	sed -e "/^CFLAGS=/s:=:+=:" \
 		-e "/^CFLAGS/{s:-Os:: ; s:-g::}" \
 		-e "/^LDFLAGS=/{s:=:+=: ; s:-Wl,--as-needed::}" \
 		-e "/^CC=/s:=:?=:" \
-		-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:^\(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 "s:^\(X11_PREFIX=\).*:\1\$(PREFIX)/usr:" \
 		-i system-autodetect.mk || die
 	sed -e 's/gcc/$(CC)/g' \