summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-10-20 13:50:44 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-10-20 13:50:44 +0000
commit7922154cc759b7700a169ca27c683f3dcf3422d5 (patch)
treeaa0c03b0424c72967f5505ef4de07737812e846b /net-misc
parentMarking amd64 stable (diff)
downloadgentoo-2-7922154cc759b7700a169ca27c683f3dcf3422d5.tar.gz
gentoo-2-7922154cc759b7700a169ca27c683f3dcf3422d5.tar.bz2
gentoo-2-7922154cc759b7700a169ca27c683f3dcf3422d5.zip
Fix wrong directory, thanks armin76, bug 152071
(Portage version: 2.1.2_pre3-r5)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/vnc/ChangeLog5
-rw-r--r--net-misc/vnc/vnc-4.1.2.ebuild16
2 files changed, 17 insertions, 4 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 5c6fca240f88..9521aca28f2b 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/vnc
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.58 2006/10/16 23:38:09 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.59 2006/10/20 13:50:44 genstef Exp $
+
+ 20 Oct 2006; Stefan Schweizer <genstef@gentoo.org> vnc-4.1.2.ebuild:
+ Fix wrong directory, thanks armin76, bug 152071
16 Oct 2006; Jason Wever <weeve@gentoo.org> vnc-4.1.2.ebuild:
Stable on SPARC wrt bug #145371.
diff --git a/net-misc/vnc/vnc-4.1.2.ebuild b/net-misc/vnc/vnc-4.1.2.ebuild
index 283dc3b58097..9bed331f0097 100644
--- a/net-misc/vnc/vnc-4.1.2.ebuild
+++ b/net-misc/vnc/vnc-4.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.14 2006/10/16 23:38:09 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.15 2006/10/20 13:50:44 genstef Exp $
inherit eutils toolchain-funcs multilib autotools
@@ -62,6 +62,16 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
src_unpack() {
+ if ! use server;
+ then
+ echo
+ einfo "The 'server' USE flag will build vnc's server."
+ einfo "If '-server' is chosen only the client is built to save space."
+ einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+ ebeep
+ epause 5
+ fi
+
unpack ${A}
cd "${S}"
@@ -117,10 +127,10 @@ src_compile() {
src_install() {
dodir /usr/bin /usr/share/man/man1
- use server && dodir /usr/$(get_libdir)/modules/extensions
+ use server && dodir /usr/lib/xorg/modules/extensions
cd unix
- ./vncinstall "${D}"/usr/bin "${D}"/usr/share/man "${D}"/usr/$(get_libdir)/modules/extensions || die
+ ./vncinstall "${D}"/usr/bin "${D}"/usr/share/man "${D}"/usr/lib/xorg/modules/extensions || die "failed to run vncinstall"
cd ..
dodoc README