xmw 15/08/06 17:49:47 Modified: notion-9999.ebuild ChangeLog Added: notion-3_p2015061300-r1.ebuild Removed: notion-3_p2015061300.ebuild Log: Revbump to fix install paths, add REQUIRED_USE and fix USE=-xrandr, respect upstream system-local.mk, pkg-config.patch, readme.gentoo eclass. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.11 x11-wm/notion/notion-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-9999.ebuild?r1=1.10&r2=1.11 Index: notion-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- notion-9999.ebuild 6 Aug 2015 08:44:55 -0000 1.10 +++ notion-9999.ebuild 6 Aug 2015 17:49:47 -0000 1.11 @@ -1,10 +1,10 @@ # 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.10 2015/08/06 08:44:55 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/notion-9999.ebuild,v 1.11 2015/08/06 17:49:47 xmw Exp $ EAPI=5 -inherit eutils git-r3 multilib toolchain-funcs flag-o-matic +inherit eutils git-r3 multilib toolchain-funcs readme.gentoo DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system" HOMEPAGE="http://notion.sourceforge.net"; @@ -22,37 +22,43 @@ nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )" - DEPEND="${RDEPEND} virtual/pkgconfig" +# mod_xrandr references mod_xinerama +REQUIRED_USE="xrandr? ( xinerama )" + # needs luaposix,slingshot,... not in tree RESTRICT=test src_prepare() { - append-cflags -D_DEFAULT_SOURCE + epatch "${FILESDIR}/${PN}-3_p2015061300-pkg-config.patch" - 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:" \ + sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \ + -e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \ -i system-autodetect.mk || die - sed -e 's/gcc/$(CC)/g' \ - -i ioncore/Makefile || die - export STRIPPROG=true - - tc-export CC + echo > build/lua-detect.mk } src_configure() { - use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT" + { echo "CFLAGS += -D_DEFAULT_SOURCE" + echo "PREFIX=${ROOT}usr" + echo "DOCDIR=\$(PREFIX)/share/doc/${PF}" + echo "ETCDIR=${ROOT}etc/${PN}" + echo "LIBDIR=\$(PREFIX)/$(get_libdir)" + echo "VARDIR=${ROOT}var/cache/${PN}" + echo "X11_PREFIX=${ROOT}usr" + echo "STRIPPROG=true" + echo "CC=$(tc-getCC)" + echo "AR=$(tc-getAR)" + echo "RANLIB=$(tc-getRANLIB)" + echo "LUA_MANUAL=1" + echo "LUA=\$(BINDIR)/lua" + echo "LUAC=\$(BINDIR)/luac" + echo "LUA_LIBS=\$(shell pkg-config --libs lua)" + echo "LUA_INCLUDES=\$(shell pkg-config --cflags)" + use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT" + } > system-local.mk if ! use xinerama ; then sed -e 's/mod_xinerama//g' -i modulelist.mk || die @@ -60,25 +66,22 @@ if ! use xrandr ; then sed -e 's/mod_xrandr//g' -i modulelist.mk || die + sed -e '/mod_xrandr/d' \ + -i etc/cfg_defaults.lua || die fi } -src_compile() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" -} - src_install() { - emake DESTDIR="${D}" PREFIX=/usr 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." + readme.gentoo_src_install } + +DOC_CONTENTS="If you want notion to have an ability to view a file based on its +guessed MIME type you should emerge app-misc/run-mailcap." 1.15 x11-wm/notion/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/ChangeLog?r1=1.14&r2=1.15 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ChangeLog 6 Aug 2015 08:44:55 -0000 1.14 +++ ChangeLog 6 Aug 2015 17:49:47 -0000 1.15 @@ -1,6 +1,14 @@ # 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.14 2015/08/06 08:44:55 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/notion/ChangeLog,v 1.15 2015/08/06 17:49:47 xmw Exp $ + +*notion-3_p2015061300-r1 (06 Aug 2015) + + 06 Aug 2015; Michael Weber <[email protected]> + +files/notion-3_p2015061300-pkg-config.patch, +notion-3_p2015061300-r1.ebuild, + -notion-3_p2015061300.ebuild, notion-9999.ebuild: + Revbump to fix install paths, add REQUIRED_USE and fix USE=-xrandr, respect + upstream system-local.mk, pkg-config.patch, readme.gentoo eclass. 06 Aug 2015; Michael Weber <[email protected]> notion-3_p2015061300.ebuild, notion-9999.ebuild: 1.1 x11-wm/notion/notion-3_p2015061300-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2015061300-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/notion/notion-3_p2015061300-r1.ebuild?rev=1.1&content-type=text/plain Index: notion-3_p2015061300-r1.ebuild =================================================================== # 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-r1.ebuild,v 1.1 2015/08/06 17:49:47 xmw Exp $ EAPI=5 inherit eutils multilib toolchain-funcs readme.gentoo 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" # mod_xrandr references mod_xinerama REQUIRED_USE="xrandr? ( xinerama )" # needs luaposix,slingshot,... not in tree RESTRICT=test S=${WORKDIR}/${P/_p/-} src_prepare() { epatch "${FILESDIR}/${P}-pkg-config.patch" sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \ -e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \ -i system-autodetect.mk || die echo > build/lua-detect.mk } src_configure() { { echo "CFLAGS += -D_DEFAULT_SOURCE" echo "PREFIX=${ROOT}usr" echo "DOCDIR=\$(PREFIX)/share/doc/${PF}" echo "ETCDIR=${ROOT}etc/${PN}" echo "LIBDIR=\$(PREFIX)/$(get_libdir)" echo "VARDIR=${ROOT}var/cache/${PN}" echo "X11_PREFIX=${ROOT}usr" echo "STRIPPROG=true" echo "CC=$(tc-getCC)" echo "AR=$(tc-getAR)" echo "RANLIB=$(tc-getRANLIB)" echo "LUA_MANUAL=1" echo "LUA=\$(BINDIR)/lua" echo "LUAC=\$(BINDIR)/luac" echo "LUA_LIBS=\$(shell pkg-config --libs lua)" echo "LUA_INCLUDES=\$(shell pkg-config --cflags)" use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT" } > system-local.mk 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 sed -e '/mod_xrandr/d' \ -i etc/cfg_defaults.lua || die fi } src_install() { default exeinto /etc/X11/Sessions doexe "${FILESDIR}"/notion insinto /usr/share/xsessions doins "${FILESDIR}"/notion.desktop readme.gentoo_src_install } DOC_CONTENTS="If you want notion to have an ability to view a file based on its guessed MIME type you should emerge app-misc/run-mailcap."
