diff options
| -rw-r--r-- | x11-wm/i3/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff | 124 | ||||
| -rw-r--r-- | x11-wm/i3/i3-4.0.2-r1.ebuild | 64 | ||||
| -rw-r--r-- | x11-wm/i3/i3-4.1.ebuild | 55 |
4 files changed, 63 insertions, 189 deletions
diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog index 4422e29a1705..ebd349e42f9c 100644 --- a/x11-wm/i3/ChangeLog +++ b/x11-wm/i3/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/i3 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.9 2011/10/10 15:24:03 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.10 2011/11/12 09:43:11 xarthisius Exp $ + +*i3-4.1 (12 Nov 2011) + + 12 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> + -files/i3-4.0.1-gentoo-r1.diff, -i3-4.0.2-r1.ebuild, +i3-4.1.ebuild: + Version bump wrt #390239 by Simeon Maryasin. Drop versionator and base + eclasses, add new deps on startup-notification and libpcre. Drop old *i3-4.0.2-r1 (10 Oct 2011) diff --git a/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff b/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff deleted file mode 100644 index 26189cb7b056..000000000000 --- a/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff +++ /dev/null @@ -1,124 +0,0 @@ ---- a/common.mk -+++ b/common.mk -@@ -1,5 +1,5 @@ - UNAME=$(shell uname) --DEBUG=1 -+DEBUG=0 - COVERAGE=0 - INSTALL=install - ifndef PREFIX -@@ -12,7 +12,7 @@ - SYSCONFDIR=$(PREFIX)/etc - endif - endif --TERM_EMU=xterm -+TERM_EMU=urxvt - # The escaping is absurd, but we need to escape for shell, sed, make, define - GIT_VERSION:="4.0 (2011-07-31, branch \\\"master\\\")" - VERSION:=4.0 -@@ -103,9 +103,6 @@ - # Extended debugging flags, macros shall be available in gcc - CFLAGS += -gdwarf-2 - CFLAGS += -g3 --else --CFLAGS += -O2 --CFLAGS += -freorder-blocks-and-partition - endif - - ifeq ($(COVERAGE),1) -@@ -113,9 +110,6 @@ - LIBS += -lgcov - endif - --# Don’t print command lines which are run --.SILENT: -- - # Always remake the following targets - .PHONY: install clean dist distclean - ---- a/Makefile -+++ b/Makefile -@@ -22,24 +22,19 @@ - - # 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: i3 subdirs - - i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES} -- echo "LINK i3" - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - subdirs: - for dir in $(SUBDIRS); do \ -- echo ""; \ -- echo "MAKE $$dir"; \ - $(MAKE) -C $$dir; \ - done - - 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); \ -@@ -51,29 +46,24 @@ - echo "};") > include/loglevels.h; - - src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS} -- echo "LEX $<" - flex -i -o$(@:.o=.c) $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) - - src/cmdparse.yy.o: src/cmdparse.l src/cmdparse.y.o ${HEADERS} -- echo "LEX $<" - flex -Pcmdyy -i -o$(@:.o=.c) $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.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) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) - - src/cmdparse.y.o: src/cmdparse.y ${HEADERS} -- echo "YACC $<" - bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $< - $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.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 -@@ -88,6 +78,7 @@ - for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir install; \ - done -+ $(MAKE) -C man install - - dist: distclean - [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} ---- a/man/Makefile -+++ b/man/Makefile -@@ -1,6 +1,9 @@ - A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf" -+include ../common.mk - --all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 -+MANS=i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 -+ -+all: $(MANS) - - %.1: %.man asciidoc.conf - ${A2M} $< -@@ -16,3 +19,7 @@ - - distclean: clean - rm -f *.1 -+ -+install: -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1 -+ $(INSTALL) -m 0644 *.1 $(DESTDIR)$(PREFIX)/share/man/man1 diff --git a/x11-wm/i3/i3-4.0.2-r1.ebuild b/x11-wm/i3/i3-4.0.2-r1.ebuild deleted file mode 100644 index 3d57a57d30ca..000000000000 --- a/x11-wm/i3/i3-4.0.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.0.2-r1.ebuild,v 1.1 2011/10/10 15:24:03 xarthisius Exp $ - -EAPI=4 - -inherit base versionator toolchain-funcs - -DESCRIPTION="An improved dynamic tiling window manager" -HOMEPAGE="http://i3wm.org/" -SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND="dev-libs/libev - dev-libs/yajl - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libX11 - x11-libs/xcb-util" -DEPEND="${CDEPEND} - app-text/asciidoc - dev-util/pkgconfig - sys-devel/flex - sys-devel/bison - x11-proto/xcb-proto" -RDEPEND="${CDEPEND} - dev-perl/AnyEvent-I3 - dev-perl/IPC-Run - dev-perl/Try-Tiny - virtual/perl-Getopt-Long - x11-apps/xmessage" - -DOCS=( GOALS TODO RELEASE-NOTES-${PV} ) -PATCHES=( "${FILESDIR}"/${PN}-4.0.1-gentoo-r1.diff ) - -pkg_setup() { - tc-export CC - ewarn "${PN} uses x11-terms/rxvt-unicode as a default terminal." - ewarn "If you wish to use another one merge ${PN} with:" - ewarn " TERM_EMU=<YOUR_TERM> emerge ${PN}" - ewarn "e.g. TERM_EMU=xterm" -} - -src_prepare() { - base_src_prepare - sed -i -e "/echo \"/d" \ - i3{bar,-config-wizard,-input,-msg,-nagbar}/Makefile || die -} - -src_install() { - base_src_install - dohtml -r docs/* - doman i3bar/doc/i3bar.1 -} - -pkg_postinst() { - elog "${PN} uses x11-terms/rxvt-unicode as a default terminal." - elog "Either merge it yourself or change proper bind in" - elog "/etc/${PN}/config or ~/.${PN}/config" -} diff --git a/x11-wm/i3/i3-4.1.ebuild b/x11-wm/i3/i3-4.1.ebuild new file mode 100644 index 000000000000..61e977cf0f3e --- /dev/null +++ b/x11-wm/i3/i3-4.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.1.ebuild,v 1.1 2011/11/12 09:43:11 xarthisius Exp $ + +EAPI=4 + +inherit toolchain-funcs + +DESCRIPTION="An improved dynamic tiling window manager" +HOMEPAGE="http://i3wm.org/" +SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-libs/libev + dev-libs/libpcre + dev-libs/yajl + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libX11 + x11-libs/startup-notification + x11-libs/xcb-util" +DEPEND="${CDEPEND} + app-text/asciidoc + dev-util/pkgconfig + sys-devel/flex + sys-devel/bison + x11-proto/xcb-proto" +RDEPEND="${CDEPEND} + dev-perl/AnyEvent-I3 + dev-perl/IPC-Run + dev-perl/Try-Tiny + virtual/perl-Getopt-Long + x11-apps/xmessage" + +DOCS=( RELEASE-NOTES-${PV} ) + +pkg_setup() { + tc-export CC +} + +src_prepare() { + sed -i common.mk \ + -e "/DEBUG=/ s/1/0/" \ + -e '/O2\|reorder\-blocks\|SILENT/d' || die +} + +src_install() { + default + dohtml -r docs/* + doman i3bar/doc/i3bar.1 man/*.1 +} |