EAPI bump, cosmetic stuff

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 39 insertions, 35 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 122972c84903..b50dab6b56dc 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.110 2014/01/22 15:11:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.111 2014/01/22 20:03:07 hasufell Exp $
+
+  22 Jan 2014; Julian Ospald <hasufell@gentoo.org> x11vnc-0.9.13-r1.ebuild:
+  EAPI bump, cosmetic stuff
 
   22 Jan 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   take over maintainership with Alex Xu as proxy
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 92612ae5b2fc..8f9fd1298f9b 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX x11vnc-0.9.13-shm-cleanup.patch 1262 SHA256 2e69b15f9d3a466181cef7ef0e5963449d4fdc473c9933d4349ddf37a6ae3521 SHA512 fe63d11e1f81861438b9d6469cbe6545c5351a5791f8d2ac4367fb540ade1e53e51cad8369316f95bd27db47d11b8e925bedf9941128133398d2bedbb61d2946 WHIRLPOOL 35467350663485c803287da7c467652bd096b88434ae2cefaa9a9af4683531a9a2102687e48a95c3f2285758140e78461036273eb2f686718fc6486e691338ed
 AUX x11vnc-0.9.13-warnings.patch 1363 SHA256 4db7b0b699e009362eaef6be222041cc333541273cf47db52dc71e521a0c4ffe SHA512 42de5aaa3f5f67f3f7f0b8af693811d6070bb05270a3b41e88705c09e436e37beb343433d5a4cd2d6922f2eb7e67c1584de1278b0ed0f92b3d01f2f233050ab1 WHIRLPOOL 408f7e7f887703aae39c9ffff70cdb7334cbb9d410d80d9b36c9cdfbef0aeaca8ff1dc1d53fb7c1f53c37cb90959b3e8815d5dc077eadf66deea5bb799ff8de7
 DIST x11vnc-0.9.13.tar.gz 2853769 SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b SHA512 7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908 WHIRLPOOL d812b257e70d6caccc6669c7fca89cacc590b5908c7877f62bdd14a159b0712b5b60e8587b6a385a5a68c46e15296ab838b07196786ac354fccb0759725685c4
-EBUILD x11vnc-0.9.13-r1.ebuild 2118 SHA256 a26f9ee6f59685ff44e11821e6148996dedf92a8466b2812b8ab5795f2630d12 SHA512 051dcfa601870094f7693498ceab8425279de4a7a64a106c53906d8f760897a05222a5d8da9ef85dbd6b884e389e98938e6c71612b2e28ad6bb4c84ebe690428 WHIRLPOOL 394bdd3694cc2a4755a6d96bf33c30d7530075183f32ab6a54078cac3a42aeaeb6cb4f33f26d92a600abd62caab879c1ede977c6ff4b4521ffd3d111103f777d
+EBUILD x11vnc-0.9.13-r1.ebuild 2097 SHA256 72676088a1df12789d6695a0b953ced478b6c62ac7018165e58c8854d2b70931 SHA512 2b794f4977bc24079c7f6ab7bc570d7964eac8dbd52899a2d2bb305f10dc27bcbfe06aa5c97fb8318a6f2d7b9f7d39d2d2c8ed396b9e45bc5d26035bb7226cdd WHIRLPOOL 8520bbe54db84a379402700a7ababe356d84759a0300c2c66931ece9667f6affd44be24e692522970f5321cbf5de36a3fa6a3e345d359c7345ab4d4ec5db369c
 EBUILD x11vnc-0.9.13.ebuild 2047 SHA256 82a2e0167e43ab2947fa8314e7165f93475b8b27fa4b9b50c4f2fbf0a9ed9a63 SHA512 8445604f172f4650118d3514f619529eed39576fc1fc4393b118025c1eff98b56ec55718de76f445c4b5ac32915291ae4ea7171bf4e7871d1131d8a06116d9ae WHIRLPOOL 6c1381128ee558b796ac512b1d284e2480e5d84e929a856e9984fb2f98a965d23f2aed22743b93f47b1d06e68ce109c743831bd1b6893373b65fd02fd5ba8cf0
-MISC ChangeLog 14750 SHA256 91a21efab3484fdfaad454d8eb8e40f7d546bd36826b8cc84e20307954f7d90e SHA512 edb4250dbc7a0fce683c27a9ff59f04d32052af131f1f1c7df4bd92f488dd8d8947e6c4401849e4479bcda8212cead1ec43c8d2d0b8e3e0f7824af60cb73cf11 WHIRLPOOL 35b30f0141f8391dfa4fcccfe269288f6a7b93e6eef9c6d6c147f80c3dae614c01363f688d910fe616c2a3bba582330fa99caa4e9d14da5664f7d81256e9a867
+MISC ChangeLog 14855 SHA256 dc39a2fbebc708e594d4fe49643440fd48703ce3e7e332c849ac78f6058ef36c SHA512 7092bc0b43a86fa9544c601fb867913a973bb71aa62c65ff1b6f10dc4bd4b0cb532bc19aed33645a9bc0f25d6080e800644cc0fd26dbdcda0056449ee05f7223 WHIRLPOOL 3e52398e49cdb7b3258f0e1be0d0aa17c735d6f1f6524a76873da552ab9cd5a9b4630270ba374d1a7e5a36489f42854cce6b7b091f2000096b73eee86902ee9e
 MISC metadata.xml 828 SHA256 2b2d24160769a901cb7087eb11f725e64d299a01870991728eefd00c26a3dc4c SHA512 791d64f4373ce7efc3ac3b1c06b22af8393036eb1d341dbc52f86cb951bace62499be1028688d04182f5fbefaac7b2693d994e141e1f36f1329fed11d47c9409 WHIRLPOOL 2692b76e5b1f581df5ee02bd97007ab3c3aefa29caf4b3dfa97842ceebfafd4646c35904fcd3450dd0b1fce0fa1fd5d7b1c9949bfa1296417f74dbad7724ec7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS39+LAAoJEFpvPKfnPDWzQRcIAIeVwm6lUINkL4MmOOGiMtc1
-/Cvy6B1YSYjtFUETSLjYsuEXZ1hz3ZVJFUHCvwsX4fmPIO0eKT1XZUuBOF58YIvh
-vXWQCEunvL48nn8fusguML2EgbVEjLY+Skg3RLGQxnrY4XuEl+RMDz9gwrMiMeR6
-8lw5SPSWoWEGpiwWK3SZeXs8k8k7Ic2S3LLnW1x5ixMf5UhyT5YRChdPI0zav3P/
-4LAqVRTV1FMLSBeQYzFhqsmLq66k9nYHUvfGlG5PJxUTRt1aFtyI2ZT7yyrVqwzC
-ej9UMCvDB5fKkXfbNuwrAk6pk9ZsoyxXASuCeMyyxiYT3qkhwui8oEu0SOYQZo0=
-=H3fa
+iQEcBAEBCAAGBQJS4CQBAAoJEFpvPKfnPDWzIrMIAJsrMSQH2la6yXvPeA+TXCfm
+bNMaEfRI19BpQJhl9lmycrZe+0ympVezfmP80wecmEXfP/5MiCNoVhjhWa/+Ka4P
+kdkGNfqYgV5GQYyetfweY++7TyqcaNwdNDd94zC3hf8ef/10cGWvijseISWc+8L2
+qagD31zbRFRkV8Hcm7MQ5DwLk/sQc1BMqXpxbHYBr3U6pjtEoW5gWYG74MKWE//j
+0uJCZhfLGSLrEPiHJv4JuJGdi3UgpwUkHbNFLAO9nw9lWrOcHQ2GT80jsqazPetV
+JoAId+NQb7M3RjU3tThrVMyeq8q8pQfxVVovToJK0mFjYeXdfV2cvhovQDmR444=
+=3s7w
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
index eb739212d2d9..764907aba916 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild,v 1.3 2013/02/22 19:39:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild,v 1.4 2014/01/22 20:03:07 hasufell Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils
 
@@ -15,29 +15,30 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
 
-RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
-	!system-libvncserver? (
-		zlib? ( sys-libs/zlib )
-		jpeg? ( virtual/jpeg:0 )
-	)
-	ssl? ( dev-libs/openssl )
-	tk? ( dev-lang/tk )
-	avahi? ( >=net-dns/avahi-0.6.4 )
-	xinerama? ( x11-libs/libXinerama )
+RDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
 	>=x11-libs/libXtst-1.1.0
 	x11-libs/libXdamage
-	x11-libs/libXext"
+	x11-libs/libXext
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	ssl? ( dev-libs/openssl )
+	system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
+	!system-libvncserver? (
+		zlib? ( sys-libs/zlib )
+		jpeg? ( virtual/jpeg:0 )
+	)
+	tk? ( dev-lang/tk )
+	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	x11-libs/libXt
-	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/inputproto
 	x11-proto/trapproto
 	x11-proto/recordproto
 	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
 
 pkg_setup() {
 	if use avahi && ! use threads ; then
@@ -47,29 +48,29 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
-	epatch "${FILESDIR}"/${P}-shm-cleanup.patch
+	epatch "${FILESDIR}"/${P}-warnings.patch \
+		"${FILESDIR}"/${P}-shm-cleanup.patch
 }
 
 src_configure() {
 	# --without-v4l because of missing video4linux 2.x support wrt #389079
 	econf \
 		$(use_with system-libvncserver) \
-		$(use_with avahi) \
 		$(use_with xinerama) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with crypt) \
 		--without-v4l \
+		$(use_with fbcon fbdev) \
+		$(use_with crypt) \
+		$(use_with ssl crypto) \
+		$(use_with ssl) \
+		$(use_with avahi) \
 		$(use_with jpeg) \
 		$(use_with zlib) \
-		$(use_with threads pthread) \
-		$(use_with fbcon fbdev)
+		$(use_with threads pthread)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc x11vnc/{ChangeLog,README}
 	# Remove include files, which conflict with net-libs/libvncserver
-	rm -rf "${D}"/usr/include
+	rm -rf "${ED%/}"/usr/include
 }