From: Kacper Kowalik Date: Sun, 30 May 2010 15:40:26 +0000 (+0000) Subject: Version bump. Thanks to Tomáš Hlušička for report X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db47cf8e1a191d5bcb0f3b7443feeab14a054b88;p=gentoo.git Version bump. Thanks to Tomáš Hlušička for report Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/x11-wm/windowlab/ChangeLog b/x11-wm/windowlab/ChangeLog index 71ece8222e4f..73e443911e13 100644 --- a/x11-wm/windowlab/ChangeLog +++ b/x11-wm/windowlab/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/windowlab -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/ChangeLog,v 1.28 2009/01/09 15:42:49 remi Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/ChangeLog,v 1.29 2010/05/30 15:40:25 xarthisius Exp $ + +*windowlab-1.40 (30 May 2010) + + 30 May 2010; Kacper Kowalik + +windowlab-1.40.ebuild, +files/windowlab-1.40-gentoo.diff: + Version bump. Thanks to Tomáš HluÅ¡ička for + report 09 Jan 2009; Rémi Cardona windowlab-1.34.ebuild: Change virtual/xft dependency to x11-libs/libXft, bug 253771. diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest index 323e04ad518e..6962e1b27a41 100644 --- a/x11-wm/windowlab/Manifest +++ b/x11-wm/windowlab/Manifest @@ -1,5 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX windowlab-1.34-fixed-font.patch 386 RMD160 6e082c2b3fee202e46b79bd97c7265465f86184b SHA1 98df5ad21b90d31d80d454a666e60c5b0f4bd834 SHA256 8fa27ca0da6c06a5eaf85dcf38af7fbf3546b7c1d39895ab9ba3cb46217fb596 +AUX windowlab-1.40-gentoo.diff 1622 RMD160 c4ddfebbef662521b10888545b570f0070649c42 SHA1 30045daa43507bbcd3e145dfca9d3d6f720d31cd SHA256 c408ae231f716fc50b0889e41aa3449d3d450185d9aeb918c5ca70802dc59b91 DIST windowlab-1.34.tar 163840 RMD160 19b1ffad8134463b6970e886bdfebd7bfefb10e1 SHA1 b9e8b08a6c119f5e5536b76aaab980dc5d0c4951 SHA256 a646abd1a7b1c548621ba8fcadc32311555e89f2a45b78a0f105421d618e4d35 +DIST windowlab-1.40.tar 174080 RMD160 c33b0bcfea6eea0f5bb485491e9c572c9cc2b8b5 SHA1 12d4e740710fc05b6892ea1ff32b07fd7596a865 SHA256 1c9cca5d997cfdcec093e98b7f1996da2d806fbbe4472bdcca568863f3e75d93 EBUILD windowlab-1.34.ebuild 1344 RMD160 d6e585c05b6fe48f9b6637a35d9f27bee117f391 SHA1 4ddb627fb8cb3856d79d7adb79214822bcf1416a SHA256 014ca638c1a73f972b8b88a460426e7a32ec8e0c7c70f3904d79359d3c427866 -MISC ChangeLog 4275 RMD160 2336bae2711ada4ac14cb58ecbb3a1d9843e3def SHA1 df39020bf813ff650d35a189e18e9d4df6318e48 SHA256 5a1ab6824e95dccbd1f558fc6a09cec6ff4fe53d125acc4d3eee800290d09c5f +EBUILD windowlab-1.40.ebuild 1251 RMD160 e5bd6ce42da08acb34792141f734443e5c0725e1 SHA1 3a6e00c377d3e4d2a26c4bf8d0ebacc6212267f0 SHA256 5c1c5a41ab393a2b0030433e11e3455eda7e530d9efcc047b5abdb29a682bdd5 +MISC ChangeLog 4513 RMD160 30e0dc61cfc609ad80691621877bf46d3a23d1be SHA1 166c3c9cd3154a9a2fa29c5f968b5569430b483b SHA256 55d1cc0c2b82a58e901a5596c77b0d1c61f7c84a38fe66955a22eba2c56cd1e9 MISC metadata.xml 744 RMD160 83e4563f874fbb164a1a2a17419a3beb7f31d019 SHA1 b00f637e675ed8bf9696d9489a41537bcd74eab0 SHA256 29878d31b1ff6c703334e4876e25a1aec0e0801116da2e336cec3d00fa117c39 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAkwChvkACgkQIiMqcbOVdxR41AP9FdxXQw6wEBcjoeBT4QhU0rLT +zzAVWhgAPus136B0IM9CpE0OohN7eV2oTyAjRtvEf2XHf7Z5ftfyTvRqv79SsmhX +EEMHAw/VGRgMcm2+OT0zTxEPHS5AaOh8sXymrQjHOIkLj23Uxtig1p9iTxweiJeu +CNU5s/IanzVcS2xVkB4= +=PCIf +-----END PGP SIGNATURE----- diff --git a/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff new file mode 100644 index 000000000000..121526ceac8b --- /dev/null +++ b/x11-wm/windowlab/files/windowlab-1.40-gentoo.diff @@ -0,0 +1,53 @@ +--- Makefile.orig 2009-11-05 21:04:45.000000000 +0000 ++++ Makefile 2010-05-30 15:31:04.047559352 +0000 +@@ -5,18 +5,18 @@ + EXTRA_LIBS += -lXext + + # Set this to the hardcoded location of all files if it's not / +-PREFIX = /usr/local ++PREFIX = /usr + + # Set this to the directory, below PREFIX, where man pages + # are expected. Below this directory, the target "install" + # will put "windowlab.1x" in section "man1". +-MANBASE = /man ++MANBASE = /share/man + + # Set this to the location of the X installation you want to compile against +-XROOT = /usr/X11R6 ++XROOT = /usr + + # Some flexibility for configuration location +-CONFPREFIX = $(PREFIX) ++CONFPREFIX = + CONFDIR = /etc/X11/windowlab + + # Set this to the location of the global configuration files +@@ -43,7 +43,6 @@ + + # -------------------------------------------------------------------- + +-CC = gcc + ifndef CFLAGS + CFLAGS = -g -O2 -Wall -W + endif +@@ -63,15 +62,15 @@ + all: $(PROG) + + $(PROG): $(OBJS) +- $(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@ + + $(OBJS): %.o: %.c $(HEADERS) + $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ + + install: all +- mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR) +- mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE) +- mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc ++ install -D -m 755 $(PROG) $(BINDIR)/$(PROG) ++ install -D -m 644 $(MANPAGE) $(MANDIR)/windowlab.1 ++ install -D -m 644 windowlab.menurc $(CFGDIR)/windowlab.menurc + + clean: + rm -f $(PROG) $(OBJS) diff --git a/x11-wm/windowlab/windowlab-1.40.ebuild b/x11-wm/windowlab/windowlab-1.40.ebuild new file mode 100644 index 000000000000..5157aacd28f8 --- /dev/null +++ b/x11-wm/windowlab/windowlab-1.40.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.40.ebuild,v 1.1 2010/05/30 15:40:25 xarthisius Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +DESCRIPTION="small and simple window manager of novel design." +HOMEPAGE="http://www.nickgravgaard.com/windowlab/" +SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~x86" +IUSE="truetype" + +RDEPEND="truetype? ( x11-libs/libXft ) + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-proto/xextproto + dev-util/pkgconfig" + +pkg_setup() { + if use truetype ; then + export DEFINES=-DXFT + export EXTRA_INC=$(pkg-config --cflags xft) + export EXTRA_LIBS=$(pkg-config --libs xft) + fi + tc-export CC +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.34-fixed-font.patch" \ + "${FILESDIR}"/${P}-gentoo.diff +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc CHANGELOG README TODO || die + + exeinto /etc/X11/Sessions + cat <<- EOF > "${T}"/${PN} + #!/bin/sh + exec /usr/bin/${PN} + EOF + doexe "${T}"/${PN} +} + +pkg_postinst() { + elog "${PN}'s menu config file has been changed from" + elog "/etc/X11/${PN}/menurc to /etc/X11/${PN}/${PN}.menurc" +}