diff options
author | Jeroen Roovers <jer@gentoo.org> | 2010-09-17 01:25:59 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2010-09-17 01:25:59 +0000 |
commit | 477b3b322de6bd80a9e42a2bf789e8517393dd50 (patch) | |
tree | 7dcb68c5c7e62799339753a293a0aae0d22494de /x11-misc | |
parent | Update glibc dependency, see bug #335101 by Victor Orozco <tuxtor@shekalug.org> (diff) | |
download | historical-477b3b322de6bd80a9e42a2bf789e8517393dd50.tar.gz historical-477b3b322de6bd80a9e42a2bf789e8517393dd50.tar.bz2 historical-477b3b322de6bd80a9e42a2bf789e8517393dd50.zip |
Respect LDFLAGS (bug #337183), CC, CFLAGS. Use pkg-config for LIBS and INCLUDES. Fix includes.
Package-Manager: portage-2.2_rc82/cvs/Linux i686
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/chgres/ChangeLog | 11 | ||||
-rw-r--r-- | x11-misc/chgres/Manifest | 5 | ||||
-rw-r--r-- | x11-misc/chgres/chgres-0.1-r1.ebuild | 38 | ||||
-rw-r--r-- | x11-misc/chgres/files/chgres-0.1-flags.patch | 21 | ||||
-rw-r--r-- | x11-misc/chgres/files/chgres-0.1-includes.patch | 15 |
5 files changed, 87 insertions, 3 deletions
diff --git a/x11-misc/chgres/ChangeLog b/x11-misc/chgres/ChangeLog index 5451a8d54ab3..ca456d94b8b5 100644 --- a/x11-misc/chgres/ChangeLog +++ b/x11-misc/chgres/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/chgres -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/chgres/ChangeLog,v 1.13 2008/07/23 17:44:08 coldwind Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/chgres/ChangeLog,v 1.14 2010/09/17 01:25:58 jer Exp $ + +*chgres-0.1-r1 (17 Sep 2010) + + 17 Sep 2010; Jeroen Roovers <jer@gentoo.org> +chgres-0.1-r1.ebuild, + +files/chgres-0.1-flags.patch, +files/chgres-0.1-includes.patch: + Respect LDFLAGS (bug #337183), CC, CFLAGS. Use pkg-config for LIBS and + INCLUDES. Fix includes. 23 Jul 2008; Santiago M. Mola <coldwind@gentoo.org> chgres-0.1.ebuild: amd64 stable diff --git a/x11-misc/chgres/Manifest b/x11-misc/chgres/Manifest index ef1b4c413843..e9337469f713 100644 --- a/x11-misc/chgres/Manifest +++ b/x11-misc/chgres/Manifest @@ -1,4 +1,7 @@ +AUX chgres-0.1-flags.patch 612 RMD160 9c0167a45e2b8284c662d02cadea8f24a49961b9 SHA1 2069147af8e524b1fb72a5d1086a8c567e90e064 SHA256 4832e131ceeda3e0539111e72abab9f14bbf68520b8ba395efbc19849ad72d1d +AUX chgres-0.1-includes.patch 388 RMD160 a7f088c8453fab9d00d6635e3e1acdbff0a0dbd6 SHA1 f25d6de3aff5d399a250612a7961e5405c61d646 SHA256 8cfa40a2db71fb253df7ddf0e57ee466217411c68d9cfd5e86ac6d448b667c9b DIST chgres-0.1.tar.gz 9219 RMD160 dff610b2c712f20fe7f3bd54c7d2a14083041532 SHA1 1ad31364d62df383198fc1f01a1c923a7059fdd1 SHA256 37f76425c92c5cf8d2448c87886474348d1a05ead1ac085aa885c2533c5efb26 +EBUILD chgres-0.1-r1.ebuild 834 RMD160 b6867b3a2dfd87df0eb7fc7204d889b171ebe568 SHA1 eb7c597c6d3464d0d2094935a8ffa4dc40003043 SHA256 ba81b43237030a12ef97f680b194d5a3b49367a44d4e7b8b16483232072cce26 EBUILD chgres-0.1.ebuild 728 RMD160 2cfd141b0d5e878251426115661365c7000ce5a5 SHA1 9012db603df679d39a9f295b8184cebda925f0b3 SHA256 e7071adbc60c0ae35bad3e6dedb9005b6b0a484719ec1d96639ff36aea5e5909 -MISC ChangeLog 1555 RMD160 1be1268c4e89885d25c39efb3621232f9a40c3bd SHA1 98d75e5541e15ef883c9474a75f16620df74e471 SHA256 fd5d9a059787b4ee82c1afa3a7d9ef8853dd0ea0dc96e5ccd32bfd858422a7f0 +MISC ChangeLog 1817 RMD160 9d73a46d8414f2111134c107918b13429be2802b SHA1 352fd584dba095418f1d90bf37c7c02824a7e7f4 SHA256 fad79b139d9dc527546d25715d5fc270488a4927e032181211be14f95d5f670a MISC metadata.xml 453 RMD160 12a1f6dda966a2a90cf6447eb8b01ef776a1fb14 SHA1 34072a3095b00c5b0a6858d2dccb99b75f336a4e SHA256 fcd59870a43244416a2239d32b1fda2352c6593db42b1463b9f9c9fe160c43e8 diff --git a/x11-misc/chgres/chgres-0.1-r1.ebuild b/x11-misc/chgres/chgres-0.1-r1.ebuild new file mode 100644 index 000000000000..7a36f1ad9f5a --- /dev/null +++ b/x11-misc/chgres/chgres-0.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/chgres/chgres-0.1-r1.ebuild,v 1.1 2010/09/17 01:25:58 jer Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +DESCRIPTION="A very simple command line utility for changing X resolutions" +HOMEPAGE="http://hpwww.ec-lyon.fr/~vincent/" +SRC_URI="http://hpwww.ec-lyon.fr/~vincent/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libXxf86dga + x11-libs/libXext + x11-libs/libXxf86vm" +DEPEND="${RDEPEND} + x11-proto/xf86vidmodeproto + x11-proto/xf86dgaproto" + +src_prepare() { + epatch "${FILESDIR}"/${P}-{flags,includes}.patch +} + +src_compile() { + tc-export CC + emake || die "emake failed" +} + +src_install() { + dobin chgres + dodoc README +} diff --git a/x11-misc/chgres/files/chgres-0.1-flags.patch b/x11-misc/chgres/files/chgres-0.1-flags.patch new file mode 100644 index 000000000000..78ed2476f799 --- /dev/null +++ b/x11-misc/chgres/files/chgres-0.1-flags.patch @@ -0,0 +1,21 @@ +--- Makefile.orig 2001-04-18 23:07:56.000000000 +0200 ++++ Makefile 2010-09-17 03:08:55.000000000 +0200 +@@ -1,9 +1,9 @@ +-CFLAGS= +-LDFLAGS= -L/usr/X11R6/lib -lXext -lX11 -lXxf86vm -lXxf86dga ++LIBS= $(shell pkg-config --libs xext x11 xxf86vm xxf86dga) ++INCLUDES= $(shell pkg-config --cflags xext x11 xxf86vm xxf86dga) + prefix=/usr + + chgres: chgres.o +- $(CC) -o $@ $< $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) + + install: chgres + install -D -m 0555 chgres $(prefix)/bin/ +@@ -12,4 +12,4 @@ + rm -f core chgres.o chgres + + .c.o: +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ diff --git a/x11-misc/chgres/files/chgres-0.1-includes.patch b/x11-misc/chgres/files/chgres-0.1-includes.patch new file mode 100644 index 000000000000..6c686c255967 --- /dev/null +++ b/x11-misc/chgres/files/chgres-0.1-includes.patch @@ -0,0 +1,15 @@ +--- chgres.c.orig 2001-04-18 22:40:05.000000000 +0200 ++++ chgres.c 2010-09-17 03:20:37.000000000 +0200 +@@ -17,9 +17,11 @@ + */ + + #include <X11/Xlib.h> +-#include <X11/extensions/xf86dga.h> ++#include <X11/extensions/Xxf86dga.h> + #include <X11/extensions/xf86vmode.h> + #include <stdio.h> ++#include <stdlib.h> /* exit() */ ++#include <strings.h> /* strcasecmp() */ + + #define VERSION "0.1" + |