summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2012-09-17 07:31:24 +0000
committerRaúl Porcel <armin76@gentoo.org>2012-09-17 07:31:24 +0000
commit6498681261e50df44c6c49f4014903cd786b83e8 (patch)
treeea2bdb344648ecf20bbec3d6140c89a4b7dbed3b /net-misc/tigervnc
parentPHP bumps (diff)
downloadgentoo-2-6498681261e50df44c6c49f4014903cd786b83e8.tar.gz
gentoo-2-6498681261e50df44c6c49f4014903cd786b83e8.tar.bz2
gentoo-2-6498681261e50df44c6c49f4014903cd786b83e8.zip
Fix QA issues wrt EAPI4, bug #435272
(Portage version: 2.1.11.16/cvs/Linux ia64)
Diffstat (limited to 'net-misc/tigervnc')
-rw-r--r--net-misc/tigervnc/ChangeLog5
-rw-r--r--net-misc/tigervnc/tigervnc-1.2.0.ebuild9
2 files changed, 9 insertions, 5 deletions
diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 018716697bd9..7a900f3fcca8 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/tigervnc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.141 2012/09/16 18:14:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.142 2012/09/17 07:31:24 armin76 Exp $
+
+ 17 Sep 2012; Raúl Porcel <armin76@gentoo.org> tigervnc-1.2.0.ebuild:
+ Fix QA issues wrt EAPI4, bug #435272
16 Sep 2012; Raúl Porcel <armin76@gentoo.org> tigervnc-1.1.0-r7.ebuild,
tigervnc-1.2.0.ebuild:
diff --git a/net-misc/tigervnc/tigervnc-1.2.0.ebuild b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
index 10111c4e9676..32503bb2bffd 100644
--- a/net-misc/tigervnc/tigervnc-1.2.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.2 2012/09/16 18:14:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.3 2012/09/17 07:31:24 armin76 Exp $
EAPI="4"
@@ -85,8 +85,6 @@ pkg_setup() {
einfo "The 'server' USE flag will build tigervnc'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
else
ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
OLD_IMPLEM="$(eselect opengl show)"
@@ -118,7 +116,7 @@ src_prepare() {
fi
}
-src_compile() {
+src_configure() {
mycmakeargs=(
-G "Unix Makefiles"
$(cmake-utils_use_use internal-fltk INCLUDED_FLTK)
@@ -126,7 +124,10 @@ src_compile() {
$(cmake-utils_use_enable pam PAM)
$(cmake-utils_use_build java JAVA)
)
+ cmake-utils_src_configure
+}
+src_compile() {
cmake-utils_src_compile
if use server ; then