Version bump (skype-4.1 compatible). Fixes bug #445786 by Rion.

Package-Manager: portage-2.2.0_alpha144_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

6 files changed, 20 insertions, 84 deletions

diff --git a/net-im/skypetab-ng/ChangeLog b/net-im/skypetab-ng/ChangeLog
index af643940e26c..d8a64d7e2c0c 100644
--- a/net-im/skypetab-ng/ChangeLog
+++ b/net-im/skypetab-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/skypetab-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.8 2012/07/26 17:01:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.9 2012/12/03 20:18:49 slyfox Exp $
+
+*skypetab-ng-0.5.1 (03 Dec 2012)
+
+  03 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> +skypetab-ng-0.5.1.ebuild,
+  -files/skypetab-ng-0.5.0-fix-multiwindows.patch, -skypetab-ng-0.5.0-r1.ebuild,
+  -skypetab-ng-0.5.0.ebuild, skypetab-ng-9999.ebuild:
+  Version bump (skype-4.1 compatible). Fixes bug #445786 by Rion.
 
   26 Jul 2012; Johannes Huber <johu@gentoo.org> skypetab-ng-0.5.0-r1.ebuild,
   skypetab-ng-0.5.0.ebuild, skypetab-ng-9999.ebuild:
diff --git a/net-im/skypetab-ng/Manifest b/net-im/skypetab-ng/Manifest
index 5efa8865b1e0..65c383157522 100644
--- a/net-im/skypetab-ng/Manifest
+++ b/net-im/skypetab-ng/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX skypetab-ng-0.5.0-fix-multiwindows.patch 763 SHA256 09082f7a05c4c20a72117f4425f87aea0fa1e38c3f2e75ee2b53d35ef08857e1 SHA512 c66cf75e266a8a5873154c66971c3c4db185c1a75a9749a3672dcf2e5213d2e0e93a9ad849c2699db65483274747661d2ace71f097a2bd2df08053fb4cca00d8 WHIRLPOOL 4c63a12f1d40817ae1835b93a36ca4a7124d77705d1336ce67c0e5ffa5120ce6ef7349e27130e724660c771d4787d0e18207e5bdcc26751776a5096795663d29
-DIST skypetab-ng-0.5.0.tar.gz 52607 SHA256 b5126939ca3567a8b737a64746a21e44b260da9f67eed259e10cb1a5f0498625 SHA512 6a29a868e29955dab50af232ee0736f767d98fc1b5c5a294c619dd6c14c3056fb6aaf84da1851f95d598b34d54242cb8605d5912634d2c566ae4814d01dbce9c WHIRLPOOL 9ac0c2cc68b90e833948261cda05db2981acf2c0fa149c705f78b2c573f08eb39867811d3144b9df72568b7c031553a0dc835c8de49dc58f57ce54a940136bb2
-EBUILD skypetab-ng-0.5.0-r1.ebuild 1011 SHA256 e10f9f14ae4d246088cb29a9df680ef808793e1c327efc8190e9c2e7fb424f80 SHA512 48ffcfba74b3ba6e02f452837761431223b861fcfa344e47eea635e1ab22125aaf1738202863043731d0d1e05eb5db8239c70c21cf6f936491cb17cd99887719 WHIRLPOOL e2eeeeadd9ccb68eca216fcbc60433513b8474a862b50b89a907d082e7f385c6a84d844faa5a3dca54849f93c33ffec7d73f3fb7222649a8a10890623020ebd9
-EBUILD skypetab-ng-0.5.0.ebuild 932 SHA256 0110795ba873310cbf6a138073d5e246e40eac295b0aa503bc604675a63152d9 SHA512 d60329c44494f77bc1f897c3eb3412d0407fa6da4b090dd5b7bb9bfb4c881c82715cb2a8c3356977f1ea28a167592ef6d3d6b3107c8f32e107dbdb6c5ded9199 WHIRLPOOL 0075726921fb9734a8e6c0542211383174db74ff934d34fc76514f7c18b071956ddf8c9ed93a937867c5670c64bb56d13ea3429c8003d1d5f0f8bfd54cf66ffc
-EBUILD skypetab-ng-9999.ebuild 925 SHA256 ea2a81a76ab1880fe5464ec18a1756bfbf6ea716b6d9c290d7dc5704d0673471 SHA512 9242b57a128ffbba748fb2bb453969df5821244905eff81c31a8a1e95ec8852d8b27113f4e017e1cdf921f4dad4e06912a0fd928e6f61ef7e111ef465681ef0c WHIRLPOOL e28959d25ae45237b49e52a09eea108338bc39f817081b624f24c5955dbcb3a9b4f98bf438695ad6037ad0e78ae06d9bfd2bf35075b488ecdbee20dd6b76aea2
-MISC ChangeLog 2229 SHA256 43077fc6a12f407fee8ca12afc63f14052ccd2bd6123f9a6757deac7fd8f2e3d SHA512 17d2b878103c4f7b6798018a97a4c7ad5f4b51bdccadf3b7997c2017560b8921df512d268cf695795fe8981344f9396cd7645c255a081159f6a06a48936bc0d1 WHIRLPOOL c66efd2aff6a82bf30be8cdf90f6c644b5fc041abc5ec5e4774b05b9087e33cbb9c170265745131f6a6c20d13762668d95206c67aed81be7f0409d4a8c2b2c7f
+DIST skypetab-ng-0.5.1.tar.gz 53486 SHA256 fb45d2a86a209e133ebfe82b7a84c9806a9b63eaefce2de180501dbb093c9058 SHA512 dd2eb8e17a0cac3a8d6ce0a76c4e6ae1e56209dfa8bbf65e8637b5f45b2201fa9e9e96f7d03058f40cecbc79bcd1120d8abf04c81eedbbd2bccc780dfd8d668b WHIRLPOOL f5f97d26dc0248e12dad8fa006cb612a7095bb2eaf5f8c93a1c4bc9c109b8d440eed2c462dfa9e3cf41f059a1d247c55bbd8497622541cb33b7de34b58a41b14
+EBUILD skypetab-ng-0.5.1.ebuild 959 SHA256 3268b3e5e238a33074a7c96be4111842205832ec08d73ffa012147d10c046e12 SHA512 9fc6f462057c0a83b36d82567272cdbbb932686ce683915c3029a3f24844692660fb605e96642b28038e6d0e74541358214da1f6947348375d81e678fce98b2a WHIRLPOOL be668a52bcff6e7888a745010c110d985d7b83f98d041a6e7b4f687804d208afbe4fd4593da36b52840b28ba2728e1e6530982b90d94f427c72f2c983e984120
+EBUILD skypetab-ng-9999.ebuild 958 SHA256 453ae09344b45d5b573c5da13f2e484a0f3acb7ec34ee9f6dbdac9ad2a4ca440 SHA512 b6c94fe74a764ce421accd2c59ad4cbbf2eb4b05e4a5bbba2ec9cdb74f48b61b02273a39eb27fc718bca47f9590c171cd2070a40d85af2b66fb8f22f0f00f582 WHIRLPOOL 10d7843128ad73f2f8d9f9ab13741c2199084537af8a32654cca8f06c426b1dedd74764e466c52aca4a4a35833b0fde72f40182c6263fa5f167653530945a0a0
+MISC ChangeLog 2548 SHA256 b07102fa5369c2524449919b34ff6a44dc2a9b9804ccc167d43456bbae25b2ad SHA512 42d55afa8fbdc47ef1e65d42c6ae7e1e3f2e83197ac644bf2791e6ce2cfe3f669eec2c4538564b25ac8644d0c92b947c9fe7e0d7e65052a0ce987a7efda1fae0 WHIRLPOOL da5915985214fa7f68aa4d525f89f110b929a9f5304de89ebe38d5b3427dfc481a5d613c5abeaa1557a34c7246f13c2449d76f352bdd11292225ff7aca3ad3eb
 MISC metadata.xml 285 SHA256 5b7e5a7dd46327e901035dee668f098d4809e91234fd75f6d1cf2c3db7178d16 SHA512 c83f84d36f446da066e0205c938218bf775caa2b7bca33047137f0e87a10aa89731d6875d3849b3162979101ddb2e4ef6923d37521d63ccb560418221135d94c WHIRLPOOL 8d7d2e85da6081b04918ac0010a12c93ba5f524dd6f7995dd437026fbd952d6d95aded099c1eec14321bfa70ca4f748d717f2ce9ad12fcb0b66ea37b7e4f25cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQEXfzAAoJEO+t9ga+3I3art8H/jn+mdUQU59Sa5vTq+4BEJUf
-pOXduO73UBomOflGQtj6redW+39kj7CBDE++rRgzLLgt158xlL0CI1xOEx3X4is5
-vnDv8U1OZAtMYsVtwlRqlbe2udIxQCuM7sgFLCSJtR2U6OXT19SKhXU+dWIliXhL
-Xnw3Z5Wn0G12+UzlCrG52DypEBa4m7KPQuIjftKjCtFrQYteb1ua8VDqKopEMlEY
-rz3lgxwYoOmSAHgx+AAPm8JetG2wA0231jZ9z13e83TQYyVukm33tuKxASZt0tNV
-gQhvfy+MYUiVorElZ2AY1EB+w8xV2KdA97PH9Km21g8pmKoKKHrypbrKpUMwdhc=
-=YIuG
+iEYEAREIAAYFAlC9CSEACgkQcaHudmEf86p1WACfSiTf/XHzRR6888h7hKVpujUp
+WvcAnAp+EonjxNAU/w89eAB3ifYhWok0
+=vHrZ
 -----END PGP SIGNATURE-----
diff --git a/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch b/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch
deleted file mode 100644
index 7edf056ccbe8..000000000000
--- a/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ea02a30f76d771a70e5efc9dcb251c93f869784e Mon Sep 17 00:00:00 2001
-From: Nikita Tsukanov <keks9n@gmail.com>
-Date: Fri, 15 Jun 2012 16:38:27 +0400
-Subject: [PATCH] Fix 1 > 0
-
----
- skypetab-ng         |    2 +-
-# skypetab-ng.src.rpm |  Bin 28866 -> 28851 bytes
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/skypetab-ng b/skypetab-ng
-index 1cc6d6b..c53dbf8 100755
---- a/skypetab-ng
-+++ b/skypetab-ng
-@@ -5,7 +5,7 @@ then
- 	find|grep config.xml|while read line;
- 	do
- 		sed -i "s/.UseUniqueConversationsWindow.*//" $line
--		sed -i "s/<UI>/<UI>\n    <UseUniqueConversationsWindow>1<\/UseUniqueConversationsWindow>/" $line
-+		sed -i "s/<UI>/<UI>\n    <UseUniqueConversationsWindow>0<\/UseUniqueConversationsWindow>/" $line
- 		cat $line
- 	done
- fi
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild
deleted file mode 100644
index dfb3efe7d9bb..000000000000
--- a/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild,v 1.2 2012/07/26 17:01:38 johu Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
-	UNPACKER_ECLASS="git-2"
-	LIVE_EBUILD=yes
-else
-	UNPACKER_ECLASS="vcs-snapshot"
-fi
-
-inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
-	KEYWORDS="-* ~x86 ~amd64"
-	SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV}-fixed -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
-HOMEPAGE="http://github.com/kekekeks/skypetab-ng"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	x11-libs/qt-gui:4
-	amd64? ( app-emulation/emul-linux-x86-qtlibs )
-"
-RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-multiwindows.patch
-}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-}
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.0.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.1.ebuild
index 0172faf1474c..811225a73907 100644
--- a/net-im/skypetab-ng/skypetab-ng-0.5.0.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.1.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-im/skypetab-ng/skypetab-ng-0.5.0.ebuild,v 1.2 2012/07/26 17:01:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.1.ebuild,v 1.1 2012/12/03 20:18:49 slyfox Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ inherit qt4-r2 multilib ${UNPACKER_ECLASS}
 
 if [[ -z ${LIVE_EBUILD} ]]; then
 	KEYWORDS="-* ~x86 ~amd64"
-	SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV}-fixed -> ${P}.tar.gz"
+	SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
@@ -30,7 +30,7 @@ DEPEND="
 	amd64? ( app-emulation/emul-linux-x86-qtlibs )
 "
 RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 "
 
 pkg_setup() {
diff --git a/net-im/skypetab-ng/skypetab-ng-9999.ebuild b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
index 38e31b1f2f38..da764ba48e0b 100644
--- a/net-im/skypetab-ng/skypetab-ng-9999.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-9999.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-im/skypetab-ng/skypetab-ng-9999.ebuild,v 1.4 2012/07/26 17:01:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-9999.ebuild,v 1.5 2012/12/03 20:18:49 slyfox Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ DEPEND="
 	amd64? ( app-emulation/emul-linux-x86-qtlibs )
 "
 RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 "
 
 pkg_setup() {