| 1 |
jer 11/12/04 17:10:39 |
| 2 |
|
| 3 |
Modified: i855crt-0.4-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path names in patch. Fix underlinking (bug #369319). Respect CC. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 x11-misc/i855crt/i855crt-0.4-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: i855crt-0.4-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- i855crt-0.4-r1.ebuild 21 Jul 2010 14:41:33 -0000 1.2 |
| 23 |
+++ i855crt-0.4-r1.ebuild 4 Dec 2011 17:10:39 -0000 1.3 |
| 24 |
@@ -1,8 +1,10 @@ |
| 25 |
-# Copyright 1999-2010 Gentoo Foundation |
| 26 |
+# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.2 2010/07/21 14:41:33 ssuominen Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.3 2011/12/04 17:10:39 jer Exp $ |
| 30 |
|
| 31 |
-inherit eutils |
| 32 |
+EAPI=4 |
| 33 |
+ |
| 34 |
+inherit eutils toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver" |
| 37 |
HOMEPAGE="http://i855crt.sourceforge.net/" |
| 38 |
@@ -13,21 +15,28 @@ |
| 39 |
KEYWORDS="~x86" |
| 40 |
IUSE="" |
| 41 |
|
| 42 |
-DEPEND="x11-libs/libXext |
| 43 |
- x11-libs/libXv" |
| 44 |
+DEPEND=" |
| 45 |
+ x11-libs/libX11 |
| 46 |
+ x11-libs/libXv |
| 47 |
+" |
| 48 |
RDEPEND="${DEPEND}" |
| 49 |
|
| 50 |
-src_unpack() { |
| 51 |
- unpack ${A} |
| 52 |
- cd "${S}" |
| 53 |
+src_prepare() { |
| 54 |
epatch "${FILESDIR}"/${PN}-i915support.diff |
| 55 |
|
| 56 |
+ # respect CC, fix underlinking |
| 57 |
+ sed -i Makefile \ |
| 58 |
+ -e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \ |
| 59 |
+ || die |
| 60 |
+ export LIBS="-lX11" |
| 61 |
+ tc-export CC |
| 62 |
+ |
| 63 |
# upstream ships it with the binary, we want to make sure we compile it |
| 64 |
- make clean || die |
| 65 |
+ emake clean |
| 66 |
} |
| 67 |
|
| 68 |
src_install() { |
| 69 |
- dobin i855crt || die |
| 70 |
+ dobin i855crt |
| 71 |
insinto /etc |
| 72 |
- doins i855crt.conf || die |
| 73 |
+ doins i855crt.conf |
| 74 |
} |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.9 x11-misc/i855crt/ChangeLog |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i855crt/ChangeLog?rev=1.9&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i855crt/ChangeLog?rev=1.9&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i855crt/ChangeLog?r1=1.8&r2=1.9 |
| 83 |
|
| 84 |
Index: ChangeLog |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v |
| 87 |
retrieving revision 1.8 |
| 88 |
retrieving revision 1.9 |
| 89 |
diff -u -r1.8 -r1.9 |
| 90 |
--- ChangeLog 4 Dec 2011 16:55:22 -0000 1.8 |
| 91 |
+++ ChangeLog 4 Dec 2011 17:10:39 -0000 1.9 |
| 92 |
@@ -1,6 +1,11 @@ |
| 93 |
# ChangeLog for x11-misc/i855crt |
| 94 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.8 2011/12/04 16:55:22 jer Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.9 2011/12/04 17:10:39 jer Exp $ |
| 97 |
+ |
| 98 |
+ 04 Dec 2011; Jeroen Roovers <jer@g.o> files/i855crt-i915support.diff, |
| 99 |
+ i855crt-0.4-r1.ebuild: |
| 100 |
+ Add missing DEPEND (libX11), remove unused DEPEND (libXext). Clean up path |
| 101 |
+ names in patch. Fix underlinking (bug #369319). Respect CC. |
| 102 |
|
| 103 |
04 Dec 2011; Jeroen Roovers <jer@g.o> metadata.xml: |
| 104 |
Remove meaningless maintainer tag. |
Archives