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
commit5c99a17f389a0c8af7195f826dc1543f8a42c5c1 (patch)
treee5d6e7dc39b84bbc503e35e9c5cb7971bf674332 /net-misc
parentPHP bumps (diff)
downloadhistorical-5c99a17f389a0c8af7195f826dc1543f8a42c5c1.tar.gz
historical-5c99a17f389a0c8af7195f826dc1543f8a42c5c1.tar.bz2
historical-5c99a17f389a0c8af7195f826dc1543f8a42c5c1.zip
Fix QA issues wrt EAPI4, bug #435272
Package-Manager: portage-2.1.11.16/cvs/Linux ia64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/tigervnc/ChangeLog5
-rw-r--r--net-misc/tigervnc/Manifest10
-rw-r--r--net-misc/tigervnc/tigervnc-1.2.0.ebuild9
3 files changed, 14 insertions, 10 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/Manifest b/net-misc/tigervnc/Manifest
index d39d69bcb57b..67f1e974a7f9 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -15,13 +15,13 @@ DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb75
DIST xorg-server-1.12.2.tar.bz2 5431841 SHA256 ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5 SHA512 28cc392b9183d0586cac40d349a8390bc90a240fceac689bd6a00a315c9d3ab115c37d3b283c892652f53106190707d1d74bacf256a1543741f555310a7c1ca1 WHIRLPOOL b22cf671d1dd55ff2c2c5713cdceb02cbd7a611dcd9ed63a0a80e5e0ab7677295ed73177034059422c79e5891516546c501ea54108637ef00d9bb977f2f75716
DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
EBUILD tigervnc-1.1.0-r7.ebuild 5214 SHA256 bd490ff5b37e4823f8a3df8b075e9b84b0be8d0319e6e84a543660127eb732b1 SHA512 24f7e5758562a06b3625fadd0327535952fc6e18a526a792f29e6e984cf520154ec040d5069a7886de9cd8eb1247491181383e40c6f63fc51f17a0572010365c WHIRLPOOL b25d9af010e770f2c00c3df4ccbbd9191fb658cfe49110cfa9933368edaf187f327bd280ab0f57a566c62bea76144d78cf10258e4a45a40d645169cdbce262f7
-EBUILD tigervnc-1.2.0.ebuild 4718 SHA256 72052f0d97bc3ee4967a889d493b61f60ad5226ea7b82fd7414f716436cc26e8 SHA512 4f860f9367a54b3821d2f0a73e344ecaf9050010ce94046ae20712fcf92eded47f40cd349384d8868bad348ea49d784b889bf5a8604d3bce3dc7f100fd588b04 WHIRLPOOL a9c6864aa54e7afbd0bebcd4e3842a3f06081117c8650099df3e53307a02a9637d2aa6ab18083334ca75370539a6287113045023fd60058bbdc202e9264558d5
-MISC ChangeLog 19295 SHA256 5af8f445cfd829858fe96e70de54becf96d803942c3d3fe419abd905d01548ea SHA512 9d61401101b8672956c8caba4d2aa7a90b7a807eee7813d9de4a60b9952b5ebda8067e88b6f9c9bb4e33a18d3d568abf6f7d6ec07eee28f744dd63f4c9d1bee9 WHIRLPOOL 253f35519f9f14f277d65c09fef9943e33e2760982ccd5f0185279a7114bdf5b630eedde20faffe7755faa29de28a41bbfac8283057b886190912b4050d6f0d2
+EBUILD tigervnc-1.2.0.ebuild 4746 SHA256 7283d9690c9fac7770e4bde61460343da3a6e9e7d2798c29c6053c599d956fe6 SHA512 7272c60807e565a531d7a8ff909df44177dc8b80bb0b58097bb2a07e7870f9707f0cd4468433b64bed15659deb896bf87d73e186c0db5335016a532367a42d81 WHIRLPOOL 2a02d43989d64c030dfb1253f3f478c31ca893b32ff66bc7b5cced939a62a4684e626004bd2f7c93fb3237ba7ebc99b477e812c0a787a2b0d316039271dea808
+MISC ChangeLog 19407 SHA256 df88eee0f2de8e704d4a7b70985173757d8657de9fd6b2c1b1eb9113e68f08e0 SHA512 ced426c44b61986dec00ba24d4ebc87d49e3305578cc08e3a8d8d1e33b9692c915b93494c487a97b8d7cf624c2b65d2dab104af69e00a4171adb83e527883609 WHIRLPOOL a1c7d8536fb9cfa86c8ab05de5ee521b3ba9b01fbb33318fa83fffe9227794e711af1290e32f8ab365b6a6880fd4cefacf71f26d8f32e4fc797224622073abf1
MISC metadata.xml 419 SHA256 86dbc1cfbd6cbb2e25c6e597dd377f99e50f315eaaebcc4402df4a3196e14042 SHA512 994d090964ed1dfd0404a7fd0abea328472587617cfb86c76fb73525479fa4c1db65d33d9413935df5472ab834bc27687793ad84b0996e82e3894aef456ae9a3 WHIRLPOOL 8bf5c41547ac54c04042cf22c4fc7d432842997e8530a72e4c8f0a508c4fc1f0e77689f382290824c1d3b83510447d1763e36db8606a875ab0e5af845ea2efcf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlBWFvgACgkQuQc30/atMkCYIQCgnLyZmfTdW6V0WiwLidxMR+GW
-ZMwAnRpitGoX2ykDsJK1T4GxD9CJhhp+
-=5Is+
+iEYEAREIAAYFAlBW0dMACgkQuQc30/atMkCjMgCggRpdFDAZdXyvZRPcYrzZvVfQ
+TVIAnAt11hq9ADeau3rJT6UnE8/sGrR/
+=fBqn
-----END PGP SIGNATURE-----
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