summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-25 17:42:43 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-25 17:42:43 +0000
commitc4df78bdca157f2d1ea91d67c7fccf24e46a3830 (patch)
tree7919d147c2b63b57d60f92b7caef1f73beb7d439 /net-misc/vncsnapshot
parentnet-misc/rwbs: Install binary package into /opt, #273330 (diff)
downloadhistorical-c4df78bdca157f2d1ea91d67c7fccf24e46a3830.tar.gz
historical-c4df78bdca157f2d1ea91d67c7fccf24e46a3830.tar.bz2
historical-c4df78bdca157f2d1ea91d67c7fccf24e46a3830.zip
net-misc/vncsnapshot: Fix parallel build, #295741; bump EAPI and resort ebuild
Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64
Diffstat (limited to 'net-misc/vncsnapshot')
-rw-r--r--net-misc/vncsnapshot/ChangeLog7
-rw-r--r--net-misc/vncsnapshot/Manifest17
-rw-r--r--net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild35
3 files changed, 34 insertions, 25 deletions
diff --git a/net-misc/vncsnapshot/ChangeLog b/net-misc/vncsnapshot/ChangeLog
index dc47a73b2b54..24620298bc03 100644
--- a/net-misc/vncsnapshot/ChangeLog
+++ b/net-misc/vncsnapshot/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/vncsnapshot
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/ChangeLog,v 1.15 2011/02/26 22:07:18 signals Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/ChangeLog,v 1.16 2012/06/25 17:42:43 jlec Exp $
+
+ 25 Jun 2012; Justin Lecher <jlec@gentoo.org> vncsnapshot-1.2a.ebuild:
+ Fix parallel build, #295741; bump EAPI and resort ebuild
26 Feb 2011; Kevin McCarthy <signals@gentoo.org> vncsnapshot-1.2a.ebuild:
Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
index aa72179e04ad..2433a7efbb6a 100644
--- a/net-misc/vncsnapshot/Manifest
+++ b/net-misc/vncsnapshot/Manifest
@@ -1,17 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX vncsnapshot-1.2a-amd64grey.patch 408 RMD160 16c4a65f8b4fabe740cd5a41b6c502eb7be6eccd SHA1 6d45d4c64754a7480c7557e7e38b6e72aa217242 SHA256 04f97cc37e33d0925521ab9b3551db06a1cd7e0eff71c5b2eeaa7528658e6318
DIST vncsnapshot-1.2a-src.tar.bz2 70121 RMD160 2c79eaa84943efbfd8b6ce5d3e935e08cdea8261 SHA1 fe948744a320fd6a52efdc8a76b90f41ef6f295d SHA256 ac490c4b3810d419c65cdfb48d742ca382218c3c0f04e7868520ff9a06149ca6
-EBUILD vncsnapshot-1.2a.ebuild 1008 RMD160 f5034e2389eeb79861a3f0e66a2e162c396b4b2d SHA1 7cec6c211fe2a6b8f44ef78d5764185a755cdcc9 SHA256 1f4c32fff5880fd3322796e3ba5a473f22aa18b0b68e53621c865f93eaf448a5
-MISC ChangeLog 1879 RMD160 9808f77d8ad93738b0c74e0b12848ab9262e29aa SHA1 d01abee7e87a0058b6d1bc1dd3a3e8d3e87e2fb1 SHA256 0080e28a9c4a51ae40de1a8d8c4c52156424dbd6965888fc434a8bf4f30b134e
+EBUILD vncsnapshot-1.2a.ebuild 1106 RMD160 a48bd85584c7b0ab18a95a73143ee4644866666c SHA1 8bdadabcef45e17ef471e5a3af345862dc894ff7 SHA256 c6758d4ca422c70b5cfae257e8f67b06129c32fb48c7ecfbe634d3c63aab906b
+MISC ChangeLog 2008 RMD160 943f87ad3d4b0b4ce0ec9930cca56eec944b1b25 SHA1 e5e149ce86409041daaf98a64b8c76fe0bfab247 SHA256 4f8435ce8c5b5675fbd1287b90927b670c37ae74e9c73e067c8b29e17530f66a
MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
-iJwEAQEIAAYFAk59rSIACgkQfXuS5UK5QB2aTgP/QTlXKq8OT09M7LZuuBG2BfMe
-f5o9/SuDjBUC4WoP52s3ShSyUeMEzbDBxxpKjB63aVfKt5Lfs3p/Z967KuwVlCSQ
-n/Gr1j7GEdFMES/mvRRcED+92RdUeMiv99Uy+fo2FiKVCDZqHEiMvZs6DQdEgplr
-KvKJnyMb4sP09uSvaTM=
-=g7sb
+iEYEAREKAAYFAk/ooxgACgkQgAnW8HDreRYF5QCgrfctrjjOmoLG03sp6IXpHNUq
+LIIAn2P3DpCsLBZY8Fp7owVUtKA3Rlxl
+=tAN8
-----END PGP SIGNATURE-----
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 8a6f638c21d2..2cf351569de1 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild,v 1.9 2011/02/26 22:07:18 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild,v 1.10 2012/06/25 17:42:43 jlec Exp $
+
+EAPI=4
inherit eutils
-LICENSE="GPL-2"
DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
HOMEPAGE="http://vncsnapshot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE=""
-SLOT="0"
-DEPEND="virtual/jpeg
- >=sys-libs/zlib-1.1.4"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+DEPEND="
+ virtual/jpeg
+ >=sys-libs/zlib-1.1.4"
+RDEPEND="${DEPEND}"
+src_prepare() {
epatch "${FILESDIR}/${P}-amd64grey.patch"
+ sed \
+ -e 's:-I/usr/local/include::g' \
+ -e 's:-L/usr/local/lib::g' \
+ -e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \
+ -e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \
+ -i Makefile || die
}
-# no configure for this puppy
src_compile() {
#note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
# we lost the INCLUDES in the makefile.
# bug #295741
- emake -j1 CDEBUGFLAGS="${CFLAGS}" || die "make failed"
+ emake CDEBUGFLAGS="${CXXFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
}
-# likewise, no make install (we're real Unix hackers, we are)
src_install() {
- dobin vncsnapshot || die
+ dobin vncsnapshot
cp vncsnapshot.man1 vncsnapshot.1
doman vncsnapshot.1
}