Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/i3/Manifest6
-rw-r--r--x11-wm/i3/files/i3-9999-build.patch113
-rw-r--r--x11-wm/i3/files/i3-gentoo.diff175
-rw-r--r--x11-wm/i3/i3-3e_p3.ebuild52
-rw-r--r--x11-wm/i3/i3-9999.ebuild62
-rw-r--r--x11-wm/i3/metadata.xml9
6 files changed, 0 insertions, 417 deletions
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
deleted file mode 100644
index 4c06165..0000000
--- a/x11-wm/i3/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX i3-9999-build.patch 3212 RMD160 11687098d9be7fe3e87765a25970ee8bf2147c34 SHA1 7001c2e00120ded08ffee7ca5ecf9d081b0975f7 SHA256 334a55f9c949d3b3d489d265948d57aaea34f7fff3844a590cd8f80d23a5a6dc
-AUX i3-gentoo.diff 5219 RMD160 d592d6e12f1983be50a78d43a65c1380f5366413 SHA1 8899a886209d30c21ab5f81f82f9e6a5fe487371 SHA256 a21e3f877eab4c2068f0fa7447765aa642cdf8a7756e495ef947da5118787897
-DIST i3-3.e-bf3.tar.bz2 360704 RMD160 858d92020e251b3afd34bcb0008d7ccc25d04669 SHA1 7c35f49fa14a21b606bb102b41c5f0cead4e93a3 SHA256 e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
-EBUILD i3-3e_p3.ebuild 1047 RMD160 66f5d82c72f8652fcf5dadb3446f1a9a27320f12 SHA1 e422b3ceae77a9dffe78d7c2ab7ab0948fb1a4fe SHA256 69bdfdbd358c00ec7acf5063eb95ac9a312dbe7f3f58aa372ad1c9b44ce6131f
-EBUILD i3-9999.ebuild 1171 RMD160 1de18ad68c0cbf6d7b1416bc5fab40d7dc999ebb SHA1 8649aa04e76924e477af9a43ab77047c8627e3da SHA256 0e1121dcc643ea6212f70a43b2eb37f566e1350af75fc0c2be53d1a6cf7e98bd
-MISC metadata.xml 262 RMD160 5fa004a3927201d509adf4583c80fcea57d845cb SHA1 7d07024bbe476df939b23a4552ec9a403ec8fff7 SHA256 9efce27cc1c3955b252cc5b7272629cd5b66260849fd9e5a5fae9e420a1829d9
diff --git a/x11-wm/i3/files/i3-9999-build.patch b/x11-wm/i3/files/i3-9999-build.patch
deleted file mode 100644
index 6c13460..0000000
--- a/x11-wm/i3/files/i3-9999-build.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 10af73b..b96e64e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,14 +18,22 @@ else
- UNUSED:=$(shell $(MAKE) loglevels.h)
- endif
-
-+SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard
-+
- # Depend on the specific file (.c for each .o) and on all headers
- src/%.o: src/%.c ${HEADERS}
- echo "CC $<"
- $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $<
-
--all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
-- echo "LINK i3"
-- $(CC) $(LDFLAGS) -o i3 $^ $(LIBS)
-+all: i3 subdirs
-+
-+i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+
-+subdirs:
-+ for dir in $(SUBDIRS); do \
-+ $(MAKE) -C $$dir; \
-+ done
-
- loglevels.h:
- echo "LOGLEVELS"
-@@ -74,10 +82,9 @@ install: all
- $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
- $(INSTALL) -m 0644 i3.desktop $(DESTDIR)$(PREFIX)/share/xsessions/
- $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
-- $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
-- $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
-- $(MAKE) TOPDIR=$(TOPDIR) -C i3-nagbar install
-- $(MAKE) TOPDIR=$(TOPDIR) -C i3-config-wizard install
-+ for dir in $(SUBDIRS); do \
-+ $(MAKE) -C $$dir install; \
-+ done
-
- dist: distclean
- [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
-diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile
-index 688df11..690fc0f 100644
---- a/i3-config-wizard/Makefile
-+++ b/i3-config-wizard/Makefile
-@@ -13,9 +13,11 @@ HEADERS:=$(wildcard *.h)
- echo "CC $<"
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
--all: cfgparse.y.o cfgparse.yy.o ${FILES}
-+all: i3-config-wizard
-+
-+i3-config-wizard: cfgparse.y.o cfgparse.yy.o ${FILES}
- echo "LINK i3-config-wizard"
-- $(CC) $(LDFLAGS) -o i3-config-wizard $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- cfgparse.yy.o: cfgparse.l cfgparse.y.o ${HEADERS}
- echo "LEX $<"
-diff --git a/i3-input/Makefile b/i3-input/Makefile
-index 498cfb5..45653da 100644
---- a/i3-input/Makefile
-+++ b/i3-input/Makefile
-@@ -12,9 +12,11 @@ HEADERS=$(wildcard *.h)
- echo "CC $<"
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
--all: ${FILES}
-+all: i3-input
-+
-+i3-input: ${FILES}
- echo "LINK i3-input"
-- $(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS)
-
- install: all
- echo "INSTALL"
-diff --git a/i3-msg/Makefile b/i3-msg/Makefile
-index 7ea19e6..1b7c1c0 100644
---- a/i3-msg/Makefile
-+++ b/i3-msg/Makefile
-@@ -14,7 +14,9 @@ HEADERS=$(wildcard *.h)
- echo "CC $<"
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
--all: ${FILES}
-+all: i3-msg
-+
-+i3-msg: ${FILES}
- echo "LINK i3-msg"
- $(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS)
-
-diff --git a/i3-nagbar/Makefile b/i3-nagbar/Makefile
-index c9eec44..933ae76 100644
---- a/i3-nagbar/Makefile
-+++ b/i3-nagbar/Makefile
-@@ -12,9 +12,11 @@ HEADERS=$(wildcard *.h)
- echo "CC $<"
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
--all: ${FILES}
-+all: i3-nagbar
-+
-+i3-nagbar: ${FILES}
- echo "LINK i3-nagbar"
-- $(CC) $(LDFLAGS) -o i3-nagbar ${FILES} $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS)
-
- install: all
- echo "INSTALL"
diff --git a/x11-wm/i3/files/i3-gentoo.diff b/x11-wm/i3/files/i3-gentoo.diff
deleted file mode 100644
index 003707e..0000000
--- a/x11-wm/i3/files/i3-gentoo.diff
+++ /dev/null
@@ -1,175 +0,0 @@
---- common.mk
-+++ common.mk
-@@ -1,5 +1,5 @@
- UNAME=$(shell uname)
--DEBUG=1
-+DEBUG=0
- INSTALL=install
- PREFIX=/usr
- ifeq ($(PREFIX),/usr)
-@@ -17,8 +17,7 @@
- # We don’t want unused-parameter because of the use of many callbacks
- CFLAGS += -Wunused-value
- CFLAGS += -Iinclude
--CFLAGS += -I/usr/local/include
--CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-+CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-
- # Check if pkg-config is installed, because without pkg-config, the following
- # check for the version of libxcb cannot be done.
-@@ -33,27 +32,17 @@
- ifeq ($(shell pkg-config --exact-version=0.3.3 xcb-keysyms && echo 1),1)
- # xcb-keysyms fixed API from 0.3.3 to 0.3.4, so for some months, we will
- # have this here. Distributions should upgrade their libxcb in the meantime.
--CFLAGS += -DOLD_XCB_KEYSYMS_API
-+CPPFLAGS += -DOLD_XCB_KEYSYMS_API
- endif
-
--LDFLAGS += -lm
--LDFLAGS += -lxcb-keysyms
- ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
--CFLAGS += -DXCB_COMPAT
--LDFLAGS += -lxcb-atom
--LDFLAGS += -lxcb-aux
--LDFLAGS += -lxcb-event
-+CPPFLAGS += -DXCB_COMPAT
-+LIBS += -lxcb-atom -lxcb-aux -lxcb-event
- else
--LDFLAGS += -lxcb-util
-+LIBS += $(shell pkg-config --libs xcb-util)
- endif
--LDFLAGS += -lxcb-icccm
--LDFLAGS += -lxcb-xinerama
--LDFLAGS += -lxcb-randr
--LDFLAGS += -lxcb
--LDFLAGS += -lyajl
--LDFLAGS += -lX11
--LDFLAGS += -lev
--LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
-+LIBS += $(shell pkg-config --libs xcb-keysyms xcb-icccm xcb-xinerama xcb-randr xcb x11)
-+LIBS += -lyajl -lev -lm
-
- ifeq ($(UNAME),NetBSD)
- # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-@@ -63,12 +52,12 @@
-
- ifeq ($(UNAME),OpenBSD)
- CFLAGS += -I${X11BASE}/include
--LDFLAGS += -liconv
-+LIBS += -liconv
- LDFLAGS += -L${X11BASE}/lib
- endif
-
- ifeq ($(UNAME),FreeBSD)
--LDFLAGS += -liconv
-+LIBS += -liconv
- endif
-
- # Fallback for libyajl 1 which did not include yajl_version.h. We need
-@@ -76,20 +65,15 @@
- CFLAGS += -idirafter yajl-fallback
-
- ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
--CFLAGS += -D_GNU_SOURCE
-+CPPFLAGS += -D_GNU_SOURCE
- endif
-
- ifeq ($(DEBUG),1)
- # Extended debugging flags, macros shall be available in gcc
- CFLAGS += -gdwarf-2
- CFLAGS += -g3
--else
--CFLAGS += -O2
- endif
-
--# Don’t print command lines which are run
--.SILENT:
--
- # Always remake the following targets
- .PHONY: install clean dist distclean
-
---- Makefile
-+++ Makefile
-@@ -20,20 +20,14 @@
-
- # Depend on the specific file (.c for each .o) and on all headers
- src/%.o: src/%.c ${HEADERS}
-- echo "CC $<"
-- $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
-
- all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
-- echo "LINK i3"
-- $(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS)
-- echo ""
-- echo "SUBDIR i3-msg"
-+ $(CC) $(LDFLAGS) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LIBS)
- $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
-- echo "SUBDIR i3-input"
- $(MAKE) TOPDIR=$(TOPDIR) -C i3-input
-
- loglevels.h:
-- echo "LOGLEVELS"
- for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \
- do \
- echo $$(basename $$file .c); \
-@@ -45,17 +39,14 @@
- echo "};") > include/loglevels.h;
-
- src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
-- echo "LEX $<"
- flex -i -o$(@:.o=.c) $<
-- $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
-
- src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
-- echo "YACC $<"
- bison --debug --verbose -b $(basename $< .y) -d $<
-- $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
-
- install: all
-- echo "INSTALL"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3
- $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
---- i3-msg/Makefile
-+++ i3-msg/Makefile
-@@ -11,15 +11,12 @@
-
- # Depend on the specific file (.c for each .o) and on all headers
- %.o: %.c ${HEADERS}
-- echo "CC $<"
-- $(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
- all: ${FILES}
-- echo "LINK i3-msg"
-- $(CC) -o i3-msg ${FILES} $(LDFLAGS)
-+ $(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS)
-
- install: all
-- echo "INSTALL"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) -m 0755 i3-msg $(DESTDIR)$(PREFIX)/bin/
-
---- i3-input/Makefile
-+++ i3-input/Makefile
-@@ -9,15 +9,12 @@
-
- # Depend on the specific file (.c for each .o) and on all headers
- %.o: %.c ${HEADERS}
-- echo "CC $<"
-- $(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
- all: ${FILES}
-- echo "LINK i3-input"
-- $(CC) -o i3-input ${FILES} $(LDFLAGS)
-+ $(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS)
-
- install: all
-- echo "INSTALL"
- $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) -m 0755 i3-input $(DESTDIR)$(PREFIX)/bin/
-
diff --git a/x11-wm/i3/i3-3e_p3.ebuild b/x11-wm/i3/i3-3e_p3.ebuild
deleted file mode 100644
index 5d360d5..0000000
--- a/x11-wm/i3/i3-3e_p3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit base versionator toolchain-funcs
-
-MY_PV=$(version_format_string '$1.$2-${3/p/bf}')
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="http://i3wm.org/"
-SRC_URI="http://i3wm.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-libs/libev
- dev-libs/yajl
- x11-libs/libxcb
- x11-libs/libX11
- x11-libs/xcb-util"
-DEPEND="${CDEPEND}
- sys-devel/flex
- sys-devel/bison
- x11-proto/xcb-proto"
-RDEPEND="${CDEPEND}
- x11-apps/xmessage"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( GOALS TODO RELEASE-NOTES-${MY_PV} )
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.diff )
-
-pkg_setup() {
- tc-export CC
-}
-
-src_install() {
- base_src_install
- doman man/*.1
- dohtml -r docs/*
-}
-
-pkg_postinst() {
- elog "${PN} by default uses x11-terms/rxvt-unicode as a default terminal."
- elog "Either merge it yourself or change proper bind in /etc/${PN}/config"
- elog "or ~/.i3/config"
-}
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
deleted file mode 100644
index 8abb5b1..0000000
--- a/x11-wm/i3/i3-9999.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-EGIT_REPO_URI="git://code.stapelberg.de/i3"
-EGIT_BRANCH="tree"
-
-inherit eutils git-2 toolchain-funcs
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="http://i3wm.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc"
-
-CDEPEND="dev-libs/libev
- dev-libs/yajl
- x11-libs/libxcb
- x11-libs/libX11
- x11-libs/xcb-util"
-DEPEND="${CDEPEND}
- sys-devel/flex
- sys-devel/bison
- app-text/asciidoc
- app-text/xmlto
- app-text/docbook-xml-dtd
- x11-proto/xcb-proto"
-RDEPEND="${CDEPEND}
- x11-apps/xmessage"
-
-pkg_setup() {
- tc-export CC
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
- sed -e "/SILENT/d" -e "/DEBUG=/d" \
- -e '/ifeq ($(DEBUG),1)/,/endif/d' \
- -i common.mk || die
- sed -e '/echo "\([[:upper:]]\)/d' \
- -i Makefile i3-{msg,nagbar,config-wizard}/Makefile || die
-}
-
-src_compile() {
- emake || die
- emake -C man || die
- use doc && { emake -C docs || die ; }
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc GOALS TODO CMDMODE RELEASE-*
- doman man/*.1
- if use doc; then
- dohtml -r docs/*.html
- fi
-}
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
deleted file mode 100644
index 2cb4afc..0000000
--- a/x11-wm/i3/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>desktop-wm</herd>
- <maintainer>
- <email>xarthisius@gentoo.org</email>
- <name>Kacper Kowalik</name>
- </maintainer>
-</pkgmetadata>