From: Jeroen Roovers Date: Sun, 4 Dec 2011 17:10:39 +0000 (+0000) Subject: Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path names... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5f75448fbcc7e4af89b36040be48333e9b63e32a;p=gentoo.git Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path names in patch. Fix underlinking (bug #369319). Respect CC. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/x11-misc/i855crt/ChangeLog b/x11-misc/i855crt/ChangeLog index 18ca15301660..e059d1a62350 100644 --- a/x11-misc/i855crt/ChangeLog +++ b/x11-misc/i855crt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/i855crt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.8 2011/12/04 16:55:22 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.9 2011/12/04 17:10:39 jer Exp $ + + 04 Dec 2011; Jeroen Roovers files/i855crt-i915support.diff, + i855crt-0.4-r1.ebuild: + Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path + names in patch. Fix underlinking (bug #369319). Respect CC. 04 Dec 2011; Jeroen Roovers metadata.xml: Remove meaningless maintainer tag. diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest index d59f31607e6f..8edaf71ea13e 100644 --- a/x11-misc/i855crt/Manifest +++ b/x11-misc/i855crt/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX i855crt-i915support.diff 2527 RMD160 2c8acead805b39daafbafba722c24e80343b6802 SHA1 5dc9e4108c6bc7823eec6329f4730b651403f76b SHA256 b33ad441352d078e6d507aa9d68b968a2e2ae3a034fb558d1bcec9168ba0f846 +AUX i855crt-i915support.diff 2128 RMD160 6d67096d4d627b7f2b1cc5423a18a9b133e92865 SHA1 733805f0c94c4e3e3fdf3f1fe73ecb262c3ad7df SHA256 dd9f8f7b388751e47e51ffa6d3bf23c615adab1349bdaab2fea84ee166d7a8f2 DIST i855crt-0.4.tar.gz 65209 RMD160 6aa715257ff120420a32bbc2ae7165f3266fc9e0 SHA1 d0a88ae3b0ecffcb47396c937893bcd1314ec184 SHA256 942fb0cde89737e921837d5ecab2a49158b04a5389205728cfa49108ee0bc269 -EBUILD i855crt-0.4-r1.ebuild 766 RMD160 94c284446dd85921111ba890dd4cce9fe59b9ee0 SHA1 7bc5d8bad6b3614734b240c6c9b606f67f8c169a SHA256 ec8fbff678300196e3d172aa403a8d9dd8779062152a1fbb4e3acc6baa3e760a -MISC ChangeLog 1062 RMD160 0afec2d5502d4008a5919914cd4c774753560558 SHA1 ea13b1108ef3eda1da75aaeefd2ed656d4a3dff3 SHA256 baf8c07b2d6e3b6ee8613ba9680944273c4dce107ab27d4e286bf5c29d555c66 +EBUILD i855crt-0.4-r1.ebuild 898 RMD160 572191f99b44f07aab478ba17754c8c11eb0ee70 SHA1 79b30525043b232d45b2fb85a325080262ecdb8b SHA256 3914c780ae0f5f80516c56186b40693210b9b62b3bdcba4fbf85cdd51895630a +MISC ChangeLog 1306 RMD160 77ea9199dfa1fb44ac48893209793417466419f5 SHA1 c17489a57e20fb59be2d80958cf4474ff4c26ed4 SHA256 d5579ea4e6d9489c20b0941e1ce585e1fb6d0936c8780fe02c453333922c9f8a MISC metadata.xml 334 RMD160 48bd03907825332208f855806da7a36f562a7ddf SHA1 d72e50fbe5b1f73f3756fe4b80e189a4af54f795 SHA256 e882c419cf3c1d3eea4176e09135691b5b32d0a2a59a54dbdfab913f14825a48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk7bpf8ACgkQVWmRsqeSphPFzQCfeJInfS4ciLQ4ttGaBcGcAMay -LrMAnRofogxmICwjU1JNlXiGEv7fAokR -=mEMS +iEYEARECAAYFAk7bqZUACgkQVWmRsqeSphPnnQCdFddiujSPZJlTZFC/q3vHEIgt +zOkAn2RFsvdOCN/nDgTVW5R5d7ufpfxT +=Of9K -----END PGP SIGNATURE----- diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff index 83c9c38dd19a..5aea3a7dd96c 100644 --- a/x11-misc/i855crt/files/i855crt-i915support.diff +++ b/x11-misc/i855crt/files/i855crt-i915support.diff @@ -1,6 +1,5 @@ -diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c ---- ../i855-crt-0.4/dumpreg.c 2004-05-01 17:50:45.000000000 +0100 -+++ ./dumpreg.c 2005-05-31 15:18:12.927156400 +0100 +--- a/dumpreg.c ++++ b/dumpreg.c @@ -36,10 +36,11 @@ (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL || (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL || @@ -24,9 +23,8 @@ diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c exit(1); } pclose(pci_f); -diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c ---- ../i855-crt-0.4/i855crt.c 2004-05-08 13:27:20.000000000 +0100 -+++ ./i855crt.c 2005-05-31 15:17:57.100562408 +0100 +--- a/i855crt.c ++++ b/i855crt.c @@ -254,14 +254,15 @@ (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL || (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL || @@ -55,9 +53,8 @@ diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c exit(1); } pclose(pci_f); -diff -ur ../i855-crt-0.4/i855crt.h ./i855crt.h ---- ../i855-crt-0.4/i855crt.h 2004-05-01 17:06:28.000000000 +0100 -+++ ./i855crt.h 2005-05-31 15:07:53.232364328 +0100 +--- a/i855crt.h ++++ b/i855crt.h @@ -1,3 +1,4 @@ + /* diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild index 28202162afcf..e3a9fe666dd1 100644 --- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild +++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild @@ -1,8 +1,10 @@ -# 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-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.2 2010/07/21 14:41:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.3 2011/12/04 17:10:39 jer Exp $ -inherit eutils +EAPI=4 + +inherit eutils toolchain-funcs DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver" HOMEPAGE="http://i855crt.sourceforge.net/" @@ -13,21 +15,28 @@ SLOT="0" KEYWORDS="~x86" IUSE="" -DEPEND="x11-libs/libXext - x11-libs/libXv" +DEPEND=" + x11-libs/libX11 + x11-libs/libXv +" RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${PN}-i915support.diff + # respect CC, fix underlinking + sed -i Makefile \ + -e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \ + || die + export LIBS="-lX11" + tc-export CC + # upstream ships it with the binary, we want to make sure we compile it - make clean || die + emake clean } src_install() { - dobin i855crt || die + dobin i855crt insinto /etc - doins i855crt.conf || die + doins i855crt.conf }