Version bump wrt bug 313569. Thanks Nico R. Wohlgemuth <nico@lifeisabug.com> for ebuild and report. Fixes bug 314965. Thanks Diego for the report

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 160 insertions, 1 deletions

diff --git a/x11-wm/echinus/ChangeLog b/x11-wm/echinus/ChangeLog
index 64b1d0910a0a..f39fed199847 100644
--- a/x11-wm/echinus/ChangeLog
+++ b/x11-wm/echinus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/echinus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/ChangeLog,v 1.6 2010/02/23 12:51:46 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/ChangeLog,v 1.7 2010/06/07 12:24:52 xarthisius Exp $
+
+*echinus-0.4.3.2 (07 Jun 2010)
+
+  07 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +echinus-0.4.3.2.ebuild, +files/echinus-0.4.3.2-gentoo.diff:
+  Version bump wrt bug 313569. Thanks Nico R. Wohlgemuth
+  <nico@lifeisabug.com> for ebuild and report. Fixes bug 314965. Thanks
+  Diego for the report
 
 *echinus-0.4.0 (23 Feb 2010)
 
diff --git a/x11-wm/echinus/echinus-0.4.3.2.ebuild b/x11-wm/echinus/echinus-0.4.3.2.ebuild
new file mode 100644
index 000000000000..513800ff01ad
--- /dev/null
+++ b/x11-wm/echinus/echinus-0.4.3.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/echinus-0.4.3.2.ebuild,v 1.1 2010/06/07 12:24:52 xarthisius Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A window manager for X in the spirit of dwm"
+HOMEPAGE="http://plhk.ru/echinus"
+SRC_URI="http://plhk.ru/static/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
+	dodoc README || die
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	if ! has_version x11-misc/dmenu; then
+		elog "Installing ${PN} without x11-misc/dmenu"
+		elog "To have a menu you can install x11-misc/dmenu"
+		elog "and use \"Echinus*spawn\" in echinusrc"
+		elog "to launch dmenu_run. Check echinus documentation for details."
+		elog ""
+	fi
+	# x11-misc/ourico is not in portage atm, this will change soon.
+	#if ! has_version x11-misc/ourico; then
+	#	elog "Installing ${PN} without x11-misc/ourico"
+	#	elog "To have a taskbar you can install x11-misc/ourico"
+	#	elog ""
+	#fi
+	elog "A standard config file with its pixmaps has been installed to:"
+	elog "${PREFIX}/usr/share/${PN}/examples"
+	elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish."
+	elog ""
+	elog "For changing the modkey you can use \"Echinus*modkey: X\""
+	elog "in echinusrc. Replace the X with A for ALT, W for Winkey (Super),"
+	elog "S for Shift or C for the Control key."
+}
diff --git a/x11-wm/echinus/files/echinus-0.4.3.2-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.3.2-gentoo.diff
new file mode 100644
index 000000000000..2ca133606481
--- /dev/null
+++ b/x11-wm/echinus/files/echinus-0.4.3.2-gentoo.diff
@@ -0,0 +1,90 @@
+--- config.mk
++++ config.mk
+@@ -4,39 +4,17 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+-CONF = /share/examples/echinus
+-
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++CONF = /share/echinus/examples
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags xft`
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
++INCS = -I. -I/usr/include `pkg-config --cflags x11 xft`
++LIBS = -L/usr/lib -lc `pkg-config --libs x11 xft`
+ 
+ # flags
+-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${PREFIX}/${CONF}\"
+-LDFLAGS = -s ${LIBS}
+-# debug flags
+-CFLAGS = -g3 -ggdb3 -std=c99 -pedantic -O0 ${INCS} -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${PREFIX}/${CONF}\" -DDEBUG
+-LDFLAGS = -g3 -ggdb3 ${LIBS}
+-
+-# DEBUG: Show warnings (if any). Comment out to disable.
+-CFLAGS += -Wall
+-# mostly useless warnings
+-#CFLAGS += -Wall -W -Wcast-qual -Wshadow -Wwrite-strings
+-#CFLAGS += -Werror        # Treat warnings as errors.
+-#CFLAGS += -save-temps    # Keep precompiler output (great for debugging).
++CPPFLAGS = -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${PREFIX}/${CONF}\"
+ 
+ # XRandr (multihead support). Comment out to disable.
+-CFLAGS += -DXRANDR=1
+-LIBS += -lXrandr
+-
+-# Solaris
+-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+-#LDFLAGS = ${LIBS}
+-#CFLAGS += -xtarget=ultra
+-
+-# compiler and linker
+-#CC = cc
++CPPFLAGS += -DXRANDR=1
++LIBS += `pkg-config --libs xrandr`
+--- Makefile
++++ Makefile
+@@ -19,13 +19,13 @@
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	@${CC} ${CPPFLAGS} -c ${CFLAGS} ${INCS} $<
+ 
+ ${OBJ}: config.mk
+ 
+ echinus: ${OBJ} ${FILES}
+ 	@echo CC -o $@
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
++	@${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
+ 
+ clean:
+ 	@echo cleaning
+@@ -42,19 +42,15 @@
+ 
+ install: all
+ 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f echinus ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/echinus
++	@install -D -m 755 echinus ${DESTDIR}${PREFIX}/bin/echinus 
+ 	@echo installing configuration file and pixmaps to ${DESTDIR}${PREFIX}${CONF}
+-	@mkdir -p ${DESTDIR}${PREFIX}${CONF}
+-	@cp echinusrc ${DESTDIR}${PREFIX}${CONF}
++	@install -D -m 644 echinusrc ${DESTDIR}${PREFIX}${CONF}/echinusrc
+ 	@cp ${PIXMAPS} ${DESTDIR}${PREFIX}${CONF}
+ 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+ 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+ 	@sed "s/VERSION/${VERSION}/g;s|CONFDIR|${DESTDIR}${PREFIX}${CONF}|g" < echinus.1 > ${DESTDIR}${MANPREFIX}/man1/echinus.1
+ 	@echo installing README to ${DESTDIR}${PREFIX}/share/doc/echinus
+-	@mkdir -p ${DESTDIR}${PREFIX}/share/doc/echinus
+-	@sed "s|CONFDIR|${PREFIX}${CONF}|" < README > ${DESTDIR}${PREFIX}/share/doc/echinus/README
++	@sed -i -e "s|CONFDIR|${PREFIX}${CONF}|" README
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin