diff options
| -rw-r--r-- | x11-wm/echinus/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-wm/echinus/Manifest | 30 | ||||
| -rw-r--r-- | x11-wm/echinus/echinus-0.4.9.ebuild (renamed from x11-wm/echinus/echinus-0.4.3.2.ebuild) | 40 | ||||
| -rw-r--r-- | x11-wm/echinus/files/echinus-0.4.3.2-gentoo.diff | 90 | ||||
| -rw-r--r-- | x11-wm/echinus/files/echinus-0.4.9-gentoo.diff | 68 | ||||
| -rw-r--r-- | x11-wm/echinus/metadata.xml | 3 |
6 files changed, 125 insertions, 117 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/Manifest b/x11-wm/echinus/Manifest index af054257f3f1..05c5356c2bf7 100644 --- a/x11-wm/echinus/Manifest +++ b/x11-wm/echinus/Manifest @@ -1,6 +1,26 @@ -AUX echinus-0.4.3.2-gentoo.diff 2928 RMD160 772f01ea51f1d1d29ddb546be76f4342bdd8b5b8 SHA1 92f2098dab5fcb4133c23913a9c788e06d477b4a SHA256 f5417b81c7f859af885e154d3fe24c89d3468f0c24be274881b969ee07c478dc +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX echinus-0.4.9-gentoo.diff 1726 RMD160 78b9eccde4d4f5b8a0922b11546be13b6a08866e SHA1 f246a7f4ba5432d5b3b6fa2efa7213d62fbe00bc SHA256 25575d810d9c6066aa71511405674600a39b018de73bb4565f9c6bc050d73e93 AUX echinus.desktop 115 RMD160 60e9884de00f5c4ca45498aaf2cc54a369b00399 SHA1 0442a39f67c06cdb6ce3b774977490166255a8b4 SHA256 53388f1c2c9078e4f91e2c0e5de50a5c9802fa1f943cdcb01bf639a40261e480 -DIST echinus-0.4.3.2.tar.gz 30453 RMD160 4d92c9aa515994df8084c9f2de6dfbefb935a95b SHA1 6b8cb52c6c554f75240583947c3968f9c4b588ca SHA256 bf41fef15b1d68c91af8f3ad636156e146dd9837638acc174048f58fe9761f3e -EBUILD echinus-0.4.3.2.ebuild 1795 RMD160 fbb012475dfb6fd42463f02e4952adce2d18fc0e SHA1 b00aa135797e4b679682bfdef2003176259af2d8 SHA256 36de7e51d71cc914eccacfd9b5b21b05f044e69fc1d554579657b0d09335e008 -MISC ChangeLog 1411 RMD160 c44f175965135709f4dc8b7c763c659baf6eaddb SHA1 6abb57c10fa963be503c615f985773205bba6fb6 SHA256 5ab67fcaf3fd14b00b51413e9a7a2a171ce6e7bb6d44e083802d11037c82cbf6 -MISC metadata.xml 264 RMD160 0dbec941b1d3fb42a1df41965b1d1205708864b5 SHA1 5dc1be7c934754498564d14544502687548a4fa7 SHA256 ed1916344a1041988fcf769b2b0a85cb1e90ea7380c3882c5a29d734c0d1adae +DIST echinus-0.4.9.tar.gz 32934 RMD160 19810f2de7aed3e75e87f67168cf2445579959c5 SHA1 3a5b27f467e4216b87604f6b96cbb143bc2e1715 SHA256 c57ac8f72845bea02bed0c27256b4023668ae7b41ae3c461d6e9b63e24914d94 +EBUILD echinus-0.4.9.ebuild 1721 RMD160 da4233aafba8c980eeaa06c469710c1005bd88b9 SHA1 9ddcf3b8bd21deeedba7b6947dd857e514b9e4e3 SHA256 e354f2ce9ae31d3366759dda2ffae81ee52c729cfa2cf1161bba59390f555d68 +MISC ChangeLog 1712 RMD160 98355c7dd2ec49d4b723773624626670732e3690 SHA1 c2f217d15dcc71bac59fcf4377f046d73da49bff SHA256 8b51cb0870febee88f39a0e919e41da2b7547e397bcbdcf10e71e79b6230b445 +MISC metadata.xml 351 RMD160 c4779b63a4c75a25824ca703be9ca532046f31ac SHA1 ad4d3eca580c698dfaa76ec70b5240a12b2f0f5d SHA256 734c62adec1584ef40b2789558298f478dddcdf58c1f32a90701b17b51d05d1b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBCAAGBQJOtnCUAAoJEF0huFKJUZL5weYQAJV1ANFmdCB4H5t32M4owV+7 +LPMMNr8N1alm8p7G3zEkQxr/mMfrDYtdxd7iBHFOeszCIw6TMYWEI82gHrwcRjFt +hgaWM2vr0yagf0KimCbwYjq3c+kVOugKBhrf9aFU6M5yawWdgM41dmMA+qy7YrqN +9Zu2sNMmbPrk6HyesznDkfnYgRgd8zLvtMI5BvI5sW46g2qXGe+qsbxjbhlX8zMN +rA/Y/iuCgSo/5ahbTZN/Yw5LkRuUz7Gb0WqFrw92P52Savjvn52/ZRZ5H7fRpcjb +niGG4UI7z5EQQilQwS/2GkhECswcGznRuYJBwSUsmK8JuGnqZRH26nWMp72OAwcH +xXK2D9a0lBDNiaqUJrVGPZTWBQUlN7c2NVfn7BsCcmjvw9sfDIKWTug+uY9pEso/ +PDwse8kMmUuNjOkdCvn+eKc8aNsACPFlDYoWnVLrfs9J6P2A8WPdI6c97xcfXjaY +e9/rnONeD5+ZiT+xDrPQbbHeQ0v/3eD0SH5LPuG2UAwAZivPadiiUlScAKGBbC0C +liyQ+B/qvhIm7ScKCdAhrBSX/SL6wzpB6I+lwB5825wr1rxi5rU2jjT0PTsvYWWf +z1sJL9lUjgiYMwe8p2Snc9QVq6tHjxycrXXupWsDVyTfSsKwegj6UFSqt0evUx4B +eooJvpgrdnxBYSxVeA7J +=aN19 +-----END PGP SIGNATURE----- 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> |