summaryrefslogtreecommitdiff
path: root/x11-wm/notion
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /x11-wm/notion
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'x11-wm/notion')
-rw-r--r--x11-wm/notion/Manifest7
-rw-r--r--x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch76
-rw-r--r--x11-wm/notion/notion-3_p2015061300-r100.ebuild101
-rw-r--r--x11-wm/notion/notion-4.0.2_p20220613.ebuild93
-rw-r--r--x11-wm/notion/notion-9999.ebuild90
5 files changed, 139 insertions, 228 deletions
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 538f28990ee9..f0c58ae46ce3 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -1,7 +1,6 @@
AUX notion 26 BLAKE2B b39f9f65f79f85b8af02c52334f71f0eb171abf2e48af8698b4eb51929a718d1aa24cce3b0c76b5d2c05843a4e6c1485b76081704004b03f0dfb92049aad252c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8
-AUX notion-3_p2015061300-pkg-config.patch 2533 BLAKE2B 98b1c54fc92067702b77a6f4d51b87d829e124135e4004bec32ab71eaefc39c69c944810730bba8defb7e082138f12e2169cd48879177671c149a86407eef49c SHA512 7fb084b35dc274e8d943a4801f2a38d43bead5eb94d33282903416120e5116d37811b6388b61f4f402d1efeed01cf36606537cb7c0aaf8a3362e99d05c9c3fda
AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
-DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
-EBUILD notion-3_p2015061300-r100.ebuild 2362 BLAKE2B cde9df6b82ad429e29de3c65417615d44f1237f34fb9fde8f1eb83f644f25e455bd57d17bbeb895c9cf069d6705d4051e00c1fc77f90c1eb4236e814ae53219d SHA512 93ffd486ab64078d7010b949af167b93d16ae97eea741e2ad08627a559f787d72811f1379a68689efe6f9db85578239dc0e5da23d7c949c7edf59be8dc89b9a9
-EBUILD notion-9999.ebuild 2226 BLAKE2B 37f5b955dd35f1e94d00865223e0c5beb538e5e92e7dee608d5fc20b84967bdbb9f774572933be989471ebed5a801345bff1ede813a829b906bd87d2d1d8e6a8 SHA512 b63a100f090dd2a95b754a255657aceae5fd5b8dc0d2e141fd30e9640d2ff4fea2b04860d648eb00cf893255d0bca1e1a34ed5ee10bf7661e173cebc62025979
+DIST notion-4.0.2_p20220613.tar.gz 791823 BLAKE2B 2aa50eb4f710bf289dd6edb6f4696662e8d2588b337f038845efdf79aa2e2b28a725734c829de5184def6fd5d32c51f511025dadf4ad6a689c0dc4e0b0d8e3eb SHA512 7c187571a00bdf5736032c0ff0b57a0afdb20a7b4f6e66877c84bf112922ec8f5b853165d419ecc7c18fc84a873b278c3cbdad5e7399e0312066141de1dc6673
+EBUILD notion-4.0.2_p20220613.ebuild 2123 BLAKE2B 8aca9e78756246c79bc2388bc8de7d1518a4e541eb98e9f6ffe4c2d1d7ba583af364ba97c042eb7e86c73ed9729a83a200c4531b24b055d8261ee67ec04ab2e4 SHA512 6ae643d2c54358402565a52437e1fc466f35282223058c11f3c8e3141d3e78ea876c6ed1a2dd0201d9bc6ace109cac4a0e2180af1ea3b2442a1455a900f8d960
+EBUILD notion-9999.ebuild 2046 BLAKE2B 69701c3d87c27b2b41670fbf9e1d9533db62bde2882216a5d7ddf3b13cebbbd311bb272c8a665731add1075c68fff0355dfb546c93d16b4d72ef15c496b1cfb8 SHA512 7833f2282368da0b75e2f971e5929cc0d404c239ae3cefd49738b766cab04e3046a18c4a7f0f50a3d394f33ab224dadfc386d6f83230a7a1acbc92570e3ac2d8
MISC metadata.xml 441 BLAKE2B f1adc7889242f95216b90541c0b15e459738b2a375e1f74e19c52d9e5d2c5c7241c8eee77a89290d88619e5981adac8518477e6af2d2416c4596594d5a2bd671 SHA512 ebe72f7eeab009519f2d127028b210d9cc621ae6fcb60e09f8f07a35ff13eb6a66a514a2083490079749045332c4a9a35cef64d852c942761c065dd6547eb52e
diff --git a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch b/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
deleted file mode 100644
index fb718caa3158..000000000000
--- a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- notion-3-2015061300/system-autodetect.mk
-+++ notion-3-2015061300/system-autodetect.mk
-@@ -84,8 +84,8 @@
- # SunOS/Solaris
- #X11_PREFIX ?= /usr/openwin
-
--X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
--X11_INCLUDES=-I$(X11_PREFIX)/include
-+X11_LIBS=$(shell $(PKG_CONFIG) --libs x11 xext)
-+X11_INCLUDES=$(shell $(PKG_CONFIG) --cflags-only-I x11 xext)
-
- # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
- # The following setting should work around that situation.
---- notion-3-2015061300/mod_xinerama/Makefile
-+++ notion-3-2015061300/mod_xinerama/Makefile
-@@ -9,14 +9,14 @@
-
- ######################################
-
--INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
--CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
-+INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell $(PKG_CONFIG) --cflags-only-I xinerama)
-+CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xinerama)
- DOCS=LICENSE README
-
- SOURCES=mod_xinerama.c
-
- MAKE_EXPORTS=mod_xinerama
--LIBS = -L/usr/lib/x86_64-linux-gnu $(X11_LIBS) -lXinerama
-+LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xinerama)
- MODULE=mod_xinerama
- MODULE_STUB=mod_xinerama.lua
-
-@@ -44,7 +44,7 @@
-
- .PHONY: test
- test: $(SOURCES)
-- lua test_xinerama.lua
-+ $(LUA) test_xinerama.lua
-
- ######################################
-
-@@ -57,4 +57,4 @@
- ################ ls_xinerama utility ###############
-
- ls_xinerama: ls_xinerama.c
-- $(CC) ls_xinerama.c -o ls_xinerama -Wl,--as-needed -lX11 -lXinerama
-+ $(CC) $(CFLAGS) ls_xinerama.c -o ls_xinerama $(LDFLAGS) $(LIBS)
---- notion-3-2015061300/mod_xrandr/Makefile
-+++ notion-3-2015061300/mod_xrandr/Makefile
-@@ -9,13 +9,13 @@
-
- ######################################
-
--INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
--CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
-+INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell pkg-config --cflags-only-I xrandr)
-+CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xrandr)
-
- SOURCES=mod_xrandr.c
-
- MAKE_EXPORTS=mod_xrandr
--LIBS = $(X11_LIBS) -lXrandr
-+LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xrandr)
- MODULE=mod_xrandr
- MODULE_STUB=mod_xrandr.lua
- ETC=cfg_xrandr.lua
-@@ -45,7 +45,7 @@
-
- .PHONY: test
- test: $(SOURCES)
-- for i in test_xrandr*.lua ; do echo 'Testing' $$i ; lua $$i ; done
-+ for i in test_xrandr*.lua ; do echo 'Testing' $$i ; $(LUA) $$i ; done
-
- ######################################
-
diff --git a/x11-wm/notion/notion-3_p2015061300-r100.ebuild b/x11-wm/notion/notion-3_p2015061300-r100.ebuild
deleted file mode 100644
index 2aee50148789..000000000000
--- a/x11-wm/notion/notion-3_p2015061300-r100.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit lua-single toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
-HOMEPAGE="https://notionwm.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="${LUA_DEPS}
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- nls? ( sys-devel/gettext )
- xinerama? ( x11-libs/libXinerama )
- xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}"
-# luac is called at build time
-BDEPEND="${LUA_DEPS}
- virtual/pkgconfig"
-
-# mod_xrandr references mod_xinerama
-REQUIRED_USE="${LUA_REQUIRED_USE}
- xrandr? ( xinerama )"
-
-# needs slingshot,... not in tree
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3_p2015061300-pkg-config.patch
-)
-
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
- default
-
- 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=${EROOT}/usr"
- echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
- echo "ETCDIR=${EROOT}/etc/${PN}"
- echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
- echo "VARDIR=${EROOT}/var/cache/${PN}"
- echo "X11_PREFIX=${EROOT}/usr"
- echo "STRIPPROG=true"
- echo "CC=$(tc-getCC)"
- echo "AR=$(tc-getAR)"
- echo "RANLIB=$(tc-getRANLIB)"
- echo "LUA_MANUAL=1"
- echo "LUA=${LUA}"
- echo "LUAC=/usr/bin/luac5.1"
- echo "LUA_LIBS=$(lua_get_LIBS)"
- echo "LUA_INCLUDES=$(lua_get_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_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
-
-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."
diff --git a/x11-wm/notion/notion-4.0.2_p20220613.ebuild b/x11-wm/notion/notion-4.0.2_p20220613.ebuild
new file mode 100644
index 000000000000..6ba63e41d144
--- /dev/null
+++ b/x11-wm/notion/notion-4.0.2_p20220613.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit lua-single toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="https://notionwm.net/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+ inherit vcs-snapshot
+ COMMIT="f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1"
+ SRC_URI="https://github.com/raboof/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
+ xrandr? ( xinerama )"
+
+RDEPEND="
+ ${LUA_DEPS}
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ nls? ( sys-devel/gettext )
+ xinerama? ( x11-libs/libXinerama )
+ xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}"
+# luac is called at build time
+BDEPEND="
+ ${LUA_DEPS}
+ virtual/pkgconfig"
+
+src_configure() {
+ tc-export AR CC PKG_CONFIG
+ export INSTALL_STRIP=""
+
+ cat > system-local.mk <<- _EOF_ || die
+ PREFIX=${EPREFIX}/usr
+ DOCDIR=\$(PREFIX)/share/doc/${PF}
+ ETCDIR=${EPREFIX}/etc/${PN}
+ LIBDIR=\$(PREFIX)/$(get_libdir)
+ VARDIR=${EPREFIX}/var/cache/${PN}
+ LUA_MANUAL=1
+ LUA=${LUA}
+ LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+ LUA_LIBS=$(lua_get_LIBS)
+ LUA_INCLUDES=$(lua_get_CFLAGS)
+ $(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+ _EOF_
+
+ 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
+
+ local 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."
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 56c03dbb134d..3bc5247a3ad3 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,22 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-LUA_COMPAT=( lua5-{1..2} )
+LUA_COMPAT=( lua5-4 )
-inherit git-r3 lua-single toolchain-funcs readme.gentoo-r1
+inherit lua-single toolchain-funcs readme.gentoo-r1
DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
HOMEPAGE="https://notionwm.net/"
-EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+ SRC_URI="https://github.com/raboof/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS=""
IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
+ xrandr? ( xinerama )"
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+ ${LUA_DEPS}
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
@@ -25,44 +39,27 @@ RDEPEND="${LUA_DEPS}
xrandr? ( x11-libs/libXrandr )"
DEPEND="${RDEPEND}"
# luac is called at build time
-BDEPEND="${LUA_DEPS}
+BDEPEND="
+ ${LUA_DEPS}
virtual/pkgconfig"
-# mod_xrandr references mod_xinerama
-REQUIRED_USE="${LUA_REQUIRED_USE}
- xrandr? ( xinerama )"
-
-# needs slingshot,... not in tree
-RESTRICT=test
-
-src_prepare() {
- default
-
- 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=${EROOT}/usr"
- echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
- echo "ETCDIR=${EROOT}/etc/${PN}"
- echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
- echo "VARDIR=${EROOT}/var/cache/${PN}"
- echo "X11_PREFIX=${EROOT}/usr"
- echo "STRIPPROG=true"
- echo "CC=$(tc-getCC)"
- echo "AR=$(tc-getAR)"
- echo "RANLIB=$(tc-getRANLIB)"
- echo "LUA_MANUAL=1"
- echo "LUA=${LUA}"
- echo "LUAC=luac"
- echo "LUA_LIBS=$(lua_get_LIBS)"
- echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
- use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
- } > system-local.mk
+ tc-export AR CC PKG_CONFIG
+ export INSTALL_STRIP=""
+
+ cat > system-local.mk <<- _EOF_ || die
+ PREFIX=${EPREFIX}/usr
+ DOCDIR=\$(PREFIX)/share/doc/${PF}
+ ETCDIR=${EPREFIX}/etc/${PN}
+ LIBDIR=\$(PREFIX)/$(get_libdir)
+ VARDIR=${EPREFIX}/var/cache/${PN}
+ LUA_MANUAL=1
+ LUA=${LUA}
+ LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+ LUA_LIBS=$(lua_get_LIBS)
+ LUA_INCLUDES=$(lua_get_CFLAGS)
+ $(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+ _EOF_
if ! use xinerama ; then
sed -e 's/mod_xinerama//g' -i modulelist.mk || die
@@ -70,8 +67,7 @@ src_configure() {
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
+ sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die
fi
}
@@ -84,12 +80,12 @@ src_install() {
insinto /usr/share/xsessions
doins "${FILESDIR}"/notion.desktop
+ local 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."
readme.gentoo_create_doc
}
pkg_postinst() {
readme.gentoo_print_elog
}
-
-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."