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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 164 insertions, 2 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/Manifest b/x11-wm/echinus/Manifest
index 465ec7494a38..5640222d6590 100644
--- a/x11-wm/echinus/Manifest
+++ b/x11-wm/echinus/Manifest
@@ -1,12 +1,15 @@
 AUX echinus-0.3.1-modkey.patch 2227 RMD160 929f100e7387b925084e50e4d1fc353a3f6cb4d1 SHA1 07c1d4fa14207b29bd3d997de3aa792ad29d8779 SHA256 c0861a8736f5621b6756132d6b6f5f087b8776299e98313e5fb37f3373f0c6ab
+AUX echinus-0.4.3.2-gentoo.diff 2928 RMD160 772f01ea51f1d1d29ddb546be76f4342bdd8b5b8 SHA1 92f2098dab5fcb4133c23913a9c788e06d477b4a SHA256 f5417b81c7f859af885e154d3fe24c89d3468f0c24be274881b969ee07c478dc
 AUX echinus.desktop 115 RMD160 60e9884de00f5c4ca45498aaf2cc54a369b00399 SHA1 0442a39f67c06cdb6ce3b774977490166255a8b4 SHA256 53388f1c2c9078e4f91e2c0e5de50a5c9802fa1f943cdcb01bf639a40261e480
 DIST echinus-0.3.1.tar.gz 26905 RMD160 58e9db859ff7b3ade7e0c60ea795639b8bbe60c3 SHA1 d409c9970a3833b44ecc38ff27d2538b56ab7853 SHA256 f609a53cb81c28d7197fede748ab459b8f96a4d24479c9e28a0c5041b1af2fa3
 DIST echinus-0.3.2.1.tar.gz 26964 RMD160 adb254b270066eefa7153482a47c91f6e0802071 SHA1 1a168f7aa679ed5b4e7e8eaaf45dbd8b2eecd407 SHA256 574f4d20b0991047b87b1e4a557c3f8ac00a643894d0afff51e31a4e79d4b9af
 DIST echinus-0.3.6.tar.gz 29136 RMD160 50b8b0861f8f6765388c23852d4e6ce76fe86a0f SHA1 f93bf48f5ef3b86c5f8eaf0fcf356217a0fc4b98 SHA256 71c6b159d472f80765d0ab35908055d81559313200e0dbec9031a32f4048366e
 DIST echinus-0.4.0.tar.gz 28843 RMD160 7febf747f157823914c1b3603f65e90550bee9a2 SHA1 df56650fd1e83a14a18870b199e0e3872bad027d SHA256 5b85902c70549c479351603eb2ca7618bec0ae09dfb53857111f144930750f89
+DIST echinus-0.4.3.2.tar.gz 30453 RMD160 4d92c9aa515994df8084c9f2de6dfbefb935a95b SHA1 6b8cb52c6c554f75240583947c3968f9c4b588ca SHA256 bf41fef15b1d68c91af8f3ad636156e146dd9837638acc174048f58fe9761f3e
 EBUILD echinus-0.3.1.ebuild 1933 RMD160 3b65d12a44f1dbf9bf60c69052332d44f392e0dd SHA1 92cba5e49ac3f8d6bc95b3918a841bfda36e1418 SHA256 34c056c04ed68312be8589f7550f134c1485d48a118d93a5df4fdea87fa90c20
 EBUILD echinus-0.3.2.1.ebuild 1892 RMD160 4b2cff9d9647281c01972f7df613ff3167c7b62a SHA1 e1b60d77b852d0e7e3833e1635d7756dca8e6cba SHA256 5105d5aec954882aa02eb0f5d35b02102ee109653f432ab42e57a733a1e48709
 EBUILD echinus-0.3.6.ebuild 1890 RMD160 884d8c8fb1997b3ec3a525e7a7ff235703181462 SHA1 52ee4036fb748989a7f88751c1cc5963505da4d2 SHA256 6a56956c692b7e09a227ce7cbc544161a844975140c0a2725379297d95256b5a
 EBUILD echinus-0.4.0.ebuild 1890 RMD160 93e3a88931d7cc024a141783ece17038ad7799f0 SHA1 051a2291a486db7b0572ca48fd719c53ad4f5f22 SHA256 22af09c078c3a4f28c091d08b46d87366043b06b2fc9b6591f658138c4a1cbea
-MISC ChangeLog 1019 RMD160 114d9aefa26195e18a63a65e9a96111a8df701e1 SHA1 669e71780c4016dbb5ca90ec02b7db62de6fb0bb SHA256 0ff08ffaf6790b6b5b921631b03a774479a3751dd920ea925b761717c6d2acba
+EBUILD echinus-0.4.3.2.ebuild 1795 RMD160 fbb012475dfb6fd42463f02e4952adce2d18fc0e SHA1 b00aa135797e4b679682bfdef2003176259af2d8 SHA256 36de7e51d71cc914eccacfd9b5b21b05f044e69fc1d554579657b0d09335e008
+MISC ChangeLog 1325 RMD160 c681704c989b45fa040b33a688c7dba71c3d8f08 SHA1 d6eaa166bbedadf949f0ec0e6501e02e37e4c3a8 SHA256 bf2ef14d2221c5f171aef5038ac3c5584dd54b4a1869f3656699384ffe6190bc
 MISC metadata.xml 331 RMD160 9ee97f9ca6fd22e89ac025496084db4b2b6afea6 SHA1 038d1ebf449aa4bb13ebe791689df08c48e4e06b SHA256 87c4f1b074ea81b0c43831921de35e77d19323e41dafbadb2cabc80d288faf9d
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