summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2010-08-28 11:40:05 +0000
committerSven Wegener <swegener@gentoo.org>2010-08-28 11:40:05 +0000
commit77acc01b12b21f7d896add383a726e657ead292a (patch)
tree873b06213b1f7951a10b255e25a6fecf36fb9180 /x11-misc
parentalpha/ia64/s390/sh/sparc stable wrt #332957 (diff)
downloadgentoo-2-77acc01b12b21f7d896add383a726e657ead292a.tar.gz
gentoo-2-77acc01b12b21f7d896add383a726e657ead292a.tar.bz2
gentoo-2-77acc01b12b21f7d896add383a726e657ead292a.zip
Remove libvncserver include files which conflict with net-libs/libvncserver.
(Portage version: 2.2_rc71/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/x11vnc/ChangeLog6
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.11.ebuild4
2 files changed, 8 insertions, 2 deletions
diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 9aebc329ad19..467e951eb051 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/x11vnc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.89 2010/08/28 10:38:02 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.90 2010/08/28 11:40:05 swegener Exp $
+
+ 28 Aug 2010; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.11.ebuild:
+ Remove libvncserver include files which conflict with
+ net-libs/libvncserver.
28 Aug 2010; Sven Wegener <swegener@gentoo.org> x11vnc-0.9.9.ebuild,
x11vnc-0.9.10.ebuild:
diff --git a/x11-misc/x11vnc/x11vnc-0.9.11.ebuild b/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
index 5a649a50f6e0..6c00ece42b8b 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.1 2010/08/28 10:31:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.11.ebuild,v 1.2 2010/08/28 11:40:05 swegener Exp $
EAPI="2"
@@ -69,4 +69,6 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
dodoc x11vnc/{ChangeLog,README}
+ # Remove include files, which conflict with net-libs/libvncserver
+ rm -rf "${D}"/usr/include
}