| 1 |
swegener 10/08/28 11:40:05 |
| 2 |
|
| 3 |
Modified: ChangeLog x11vnc-0.9.11.ebuild |
| 4 |
Log: |
| 5 |
Remove libvncserver include files which conflict with net-libs/libvncserver. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc71/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.90 x11-misc/x11vnc/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/ChangeLog?rev=1.90&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/ChangeLog?rev=1.90&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/ChangeLog?r1=1.89&r2=1.90 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v |
| 19 |
retrieving revision 1.89 |
| 20 |
retrieving revision 1.90 |
| 21 |
diff -u -r1.89 -r1.90 |
| 22 |
--- ChangeLog 28 Aug 2010 10:38:02 -0000 1.89 |
| 23 |
+++ ChangeLog 28 Aug 2010 11:40:05 -0000 1.90 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for x11-misc/x11vnc |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.89 2010/08/28 10:38:02 swegener Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.90 2010/08/28 11:40:05 swegener Exp $ |
| 29 |
+ |
| 30 |
+ 28 Aug 2010; Sven Wegener <swegener@g.o> x11vnc-0.9.11.ebuild: |
| 31 |
+ Remove libvncserver include files which conflict with |
| 32 |
+ net-libs/libvncserver. |
| 33 |
|
| 34 |
28 Aug 2010; Sven Wegener <swegener@g.o> x11vnc-0.9.9.ebuild, |
| 35 |
x11vnc-0.9.10.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 x11-misc/x11vnc/x11vnc-0.9.11.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: x11vnc-0.9.11.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- x11vnc-0.9.11.ebuild 28 Aug 2010 10:31:14 -0000 1.1 |
| 52 |
+++ x11vnc-0.9.11.ebuild 28 Aug 2010 11:40:05 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.1 2010/08/28 10:31:14 swegener Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.2 2010/08/28 11:40:05 swegener Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
|
| 61 |
@@ -69,4 +69,6 @@ |
| 62 |
src_install() { |
| 63 |
emake DESTDIR="${D}" install || die "make install failed" |
| 64 |
dodoc x11vnc/{ChangeLog,README} |
| 65 |
+ # Remove include files, which conflict with net-libs/libvncserver |
| 66 |
+ rm -rf "${D}"/usr/include |
| 67 |
} |
Archives