Version bump wrt #382777 by Tim Harder. Make multihead optional, drop old

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

5 files changed, 100 insertions, 112 deletions

diff --git a/x11-wm/echinus/ChangeLog b/x11-wm/echinus/ChangeLog
index 9a85e05c8e1c..9c34a030f818 100644
--- a/x11-wm/echinus/ChangeLog
+++ b/x11-wm/echinus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2010/06/11 18:57:48 yngwin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/ChangeLog,v 1.9 2011/11/06 11:33:30 xarthisius Exp $
+
+*echinus-0.4.9 (06 Nov 2011)
+
+  06 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> -echinus-0.4.3.2.ebuild,
+  -files/echinus-0.4.3.2-gentoo.diff, +echinus-0.4.9.ebuild,
+  +files/echinus-0.4.9-gentoo.diff, metadata.xml:
+  Version bump wrt #382777 by Tim Harder. Make multihead optional, drop old
 
   11 Jun 2010; Ben de Groot <yngwin@gentoo.org> metadata.xml:
   Removing myself as proxy
diff --git a/x11-wm/echinus/echinus-0.4.3.2.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild
index 513800ff01ad..06966d5924ee 100644
--- a/x11-wm/echinus/echinus-0.4.3.2.ebuild
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/echinus/echinus-0.4.9.ebuild,v 1.1 2011/11/06 11:33:30 xarthisius Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -11,28 +13,32 @@ SRC_URI="http://plhk.ru/static/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="xrandr"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXft
-	x11-libs/libXrandr"
+	xrandr? ( x11-libs/libXrandr )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+DOCS=( README )
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.diff
+pkg_setup() {
+	tc-export CC
+	use xrandr && export MULTIHEAD=1
 }
 
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	sed -i -e "s|CONFDIR|/usr/share/${PN}|g" echinus.1 README || die
+	sed -i -e "s|/usr/lib|/usr/$(get_libdir)|g" config.mk || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
-	dodoc README || die
-
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+	insinto /usr/share/${PN}
+	doins {close,iconify,max}.xbm ${PN}rc
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/${PN}.desktop
 }
@@ -45,14 +51,8 @@ pkg_postinst() {
 		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 "${EPREFIX}/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\""
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
deleted file mode 100644
index 2ca133606481..000000000000
--- a/x11-wm/echinus/files/echinus-0.4.3.2-gentoo.diff
+++ /dev/null
@@ -1,90 +0,0 @@
---- 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
diff --git a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
new file mode 100644
index 000000000000..75b8b48c121a
--- /dev/null
+++ b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
@@ -0,0 +1,68 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,10 +4,10 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX?= /usr/local
++PREFIX?= /usr
+ BINPREFIX?= ${PREFIX}/bin
+ MANPREFIX?= ${PREFIX}/share/man
+-CONFPREFIX?= ${PREFIX}/share/examples
++CONFPREFIX?= ${PREFIX}/share/echinus
+ DOCPREFIX?= ${PREFIX}/share/doc
+ CONF?= ${CONFPREFIX}
+ 
+@@ -15,14 +15,13 @@
+ X11LIB?= /usr/X11R6/lib
+ 
+ # 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`
+-
+-DEFS = -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${CONF}\"
++CFLAGS += -I. -I/usr/include `pkg-config --cflags x11 xft`
++LIBS 	 += -L/usr/lib -lc `pkg-config --libs x11 xft`
++CPPFLAGS += -DVERSION=\"${VERSION}\" -DSYSCONFPATH=\"${CONF}\"
+ 
+ # flags
+-CFLAGS = -Os ${INCS} ${DEFS}
+-LDFLAGS = -s ${LIBS}
++#CFLAGS = -Os ${INCS} ${DEFS}
++#LDFLAGS = -s ${LIBS}
+ # debug flags
+ #CFLAGS = -g3 -ggdb3 -std=c99 -pedantic -O0 ${INCS} -DDEBUG ${DEFS}
+ #LDFLAGS = -g3 -ggdb3 ${LIBS}
+@@ -35,9 +34,11 @@
+ #CFLAGS += -save-temps    # Keep precompiler output (great for debugging).
+ 
+ # XRandr (multihead support). Comment out to disable.
+-CFLAGS += -DXRANDR=1
+-LIBS += -lXrandr
+-
++ifdef MULTIHEAD
++CPPFLAGS += -DXRANDR=1
++LIBS += `pkg-config --libs xrandr`
++CCFLAGS += `pkg-config --libs xrandr`
++endif
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+--- a/Makefile
++++ b/Makefile
+@@ -19,13 +19,13 @@
+ 
+ .c.o:
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} ${CPPFLAGS} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.mk ${HEADERS}
+ 
+ echinus: ${OBJ} ${SRC} ${HEADERS}
+ 	@echo CC -o $@
+-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
++	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
+ 
+ clean:
+ 	@echo cleaning
diff --git a/x11-wm/echinus/metadata.xml b/x11-wm/echinus/metadata.xml
index 5e156049d2fb..b65a74b52e84 100644
--- a/x11-wm/echinus/metadata.xml
+++ b/x11-wm/echinus/metadata.xml
@@ -6,4 +6,7 @@
 		<email>nico@lifeisabug.com</email>
 		<name>Nico R. Wohlgemuth</name>
 	</maintainer>
+	<use>
+		<flag name='xrandr'>Enable support for multihead configuration</flag>
+	</use>
 </pkgmetadata>