public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.0.0.63.ebuild skype-2.0.0.68.ebuild
@ 2008-08-11 18:21 Ben de Groot (yngwin)
  0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot (yngwin) @ 2008-08-11 18:21 UTC (permalink / raw
  To: gentoo-commits

yngwin      08/08/11 18:21:18

  Modified:             ChangeLog skype-2.0.0.63.ebuild
                        skype-2.0.0.68.ebuild
  Log:
  Fix split qt4 deps and use check wrt bug 217161.
  (Portage version: 2.2_rc7/cvs/Linux 2.6.26-hh1 i686)

Revision  Changes    Path
1.97                 net-im/skype/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog	5 Aug 2008 18:02:31 -0000	1.96
+++ ChangeLog	11 Aug 2008 18:21:17 -0000	1.97
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.96 2008/08/05 18:02:31 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.97 2008/08/11 18:21:17 yngwin Exp $
+
+  11 Aug 2008; Ben de Groot <yngwin@gentoo.org> skype-2.0.0.63.ebuild,
+  skype-2.0.0.68.ebuild:
+  Fix split qt4 deps and use check wrt bug 217161.
 
   05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Add USE flag description to metadata as per GLEP 56.



1.7                  net-im/skype/skype-2.0.0.63.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?r1=1.6&r2=1.7

Index: skype-2.0.0.63.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- skype-2.0.0.63.ebuild	28 Jul 2008 21:28:27 -0000	1.6
+++ skype-2.0.0.63.ebuild	11 Aug 2008 18:21:17 -0000	1.7
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.6 2008/07/28 21:28:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.7 2008/08/11 18:21:17 yngwin Exp $
 
 EAPI=1
 
-inherit eutils qt4 pax-utils
+inherit eutils pax-utils qt4
 
 DESCRIPTION="A P2P-VoiceIP client."
 HOMEPAGE="http://www.skype.com/"
@@ -40,7 +40,8 @@
 				x11-libs/libXrandr
 				x11-libs/libXrender
 				x11-libs/libX11 )
-		!qt-static? ( =x11-libs/qt-4.3*:4
+		!qt-static? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 )
+					=x11-libs/qt-4.3*:4 )
 				x11-libs/libX11
 				x11-libs/libXau
 				x11-libs/libXdmcp ) )"
@@ -49,17 +50,7 @@
 QA_EXECSTACK="opt/skype/skype"
 
 use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
-
-pkg_setup() {
-	if ! use qt-static && ! built_with_use ">=x11-libs/qt-4.0" accessibility dbus ; then
-		eerror "Rebuild qt-4 with USE=\"accessibility dbus\" or set USE=qt-static"
-		die "USE=\"-qt-static\" only works with qt-4 built with USE=\"accessibility dbus\"."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-}
+use !qt-static && QT4_BUILT_WITH_USE_CHECK="guiaccessibility dbus"
 
 src_install() {
 	# remove mprotect() restrictions for PaX usage - see Bug 100507



1.3                  net-im/skype/skype-2.0.0.68.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?r1=1.2&r2=1.3

Index: skype-2.0.0.68.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- skype-2.0.0.68.ebuild	28 Jul 2008 21:28:27 -0000	1.2
+++ skype-2.0.0.68.ebuild	11 Aug 2008 18:21:17 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.2 2008/07/28 21:28:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.3 2008/08/11 18:21:17 yngwin Exp $
 
 EAPI=1
 
-inherit eutils qt4 pax-utils
+inherit eutils pax-utils qt4
 
 DESCRIPTION="A P2P-VoiceIP client."
 HOMEPAGE="http://www.skype.com/"
@@ -40,7 +40,8 @@
 				x11-libs/libXrandr
 				x11-libs/libXrender
 				x11-libs/libX11 )
-		!qt-static? ( =x11-libs/qt-4.3*:4
+		!qt-static? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 )
+					=x11-libs/qt-4.3*:4 )
 				x11-libs/libX11
 				x11-libs/libXau
 				x11-libs/libXdmcp ) )"
@@ -49,17 +50,7 @@
 QA_EXECSTACK="opt/skype/skype"
 
 use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
-
-pkg_setup() {
-	if ! use qt-static && ! built_with_use ">=x11-libs/qt-4.0" accessibility dbus ; then
-		eerror "Rebuild qt-4 with USE=\"accessibility dbus\" or set USE=qt-static"
-		die "USE=\"-qt-static\" only works with qt-4 built with USE=\"accessibility dbus\"."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-}
+use !qt-static && QT4_BUILT_WITH_USE_CHECK="guiaccessibility dbus"
 
 src_install() {
 	# remove mprotect() restrictions for PaX usage - see Bug 100507






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.0.0.63.ebuild skype-2.0.0.68.ebuild
@ 2009-10-06 17:23 Dominik Kapusta (ayoy)
  0 siblings, 0 replies; 3+ messages in thread
From: Dominik Kapusta (ayoy) @ 2009-10-06 17:23 UTC (permalink / raw
  To: gentoo-commits

ayoy        09/10/06 17:23:46

  Modified:             ChangeLog skype-2.0.0.63.ebuild
                        skype-2.0.0.68.ebuild
  Log:
  Removed alternative dependency on Qt metapackage
  (Portage version: 2.2_rc43/cvs/Linux x86_64)

Revision  Changes    Path
1.102                net-im/skype/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog	14 Apr 2009 09:38:40 -0000	1.101
+++ ChangeLog	6 Oct 2009 17:23:45 -0000	1.102
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/skype
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.101 2009/04/14 09:38:40 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.102 2009/10/06 17:23:45 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> skype-2.0.0.63.ebuild,
+  skype-2.0.0.68.ebuild:
+  Removed alternative dependency on Qt metapackage
 
   14 Apr 2009; Raúl Porcel <armin76@gentoo.org> skype-2.0.0.72.ebuild:
   x86 stable wrt #262195



1.8                  net-im/skype/skype-2.0.0.63.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?r1=1.7&r2=1.8

Index: skype-2.0.0.63.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- skype-2.0.0.63.ebuild	11 Aug 2008 18:21:17 -0000	1.7
+++ skype-2.0.0.63.ebuild	6 Oct 2009 17:23:45 -0000	1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.7 2008/08/11 18:21:17 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.8 2009/10/06 17:23:45 ayoy Exp $
 
 EAPI=1
 
@@ -40,8 +40,8 @@
 				x11-libs/libXrandr
 				x11-libs/libXrender
 				x11-libs/libX11 )
-		!qt-static? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 )
-					=x11-libs/qt-4.3*:4 )
+		!qt-static? ( x11-libs/qt-gui:4
+				x11-libs/qt-dbus:4
 				x11-libs/libX11
 				x11-libs/libXau
 				x11-libs/libXdmcp ) )"



1.4                  net-im/skype/skype-2.0.0.68.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?r1=1.3&r2=1.4

Index: skype-2.0.0.68.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skype-2.0.0.68.ebuild	11 Aug 2008 18:21:17 -0000	1.3
+++ skype-2.0.0.68.ebuild	6 Oct 2009 17:23:45 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.3 2008/08/11 18:21:17 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.4 2009/10/06 17:23:45 ayoy Exp $
 
 EAPI=1
 
@@ -40,8 +40,8 @@
 				x11-libs/libXrandr
 				x11-libs/libXrender
 				x11-libs/libX11 )
-		!qt-static? ( || ( ( x11-libs/qt-gui:4 x11-libs/qt-dbus:4 )
-					=x11-libs/qt-4.3*:4 )
+		!qt-static? ( x11-libs/qt-gui:4
+				x11-libs/qt-dbus:4
 				x11-libs/libX11
 				x11-libs/libXau
 				x11-libs/libXdmcp ) )"






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.0.0.63.ebuild skype-2.0.0.68.ebuild
@ 2009-10-06 18:57 Dominik Kapusta (ayoy)
  0 siblings, 0 replies; 3+ messages in thread
From: Dominik Kapusta (ayoy) @ 2009-10-06 18:57 UTC (permalink / raw
  To: gentoo-commits

ayoy        09/10/06 18:57:51

  Modified:             ChangeLog skype-2.0.0.63.ebuild
                        skype-2.0.0.68.ebuild
  Log:
  Removed obsolete (and unneeded) QT4_BUILT_WITH_USE_CHECK
  (Portage version: 2.2_rc44/cvs/Linux x86_64)

Revision  Changes    Path
1.103                net-im/skype/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/ChangeLog?r1=1.102&r2=1.103

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog	6 Oct 2009 17:23:45 -0000	1.102
+++ ChangeLog	6 Oct 2009 18:57:51 -0000	1.103
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.102 2009/10/06 17:23:45 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.103 2009/10/06 18:57:51 ayoy Exp $
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> skype-2.0.0.63.ebuild,
+  skype-2.0.0.68.ebuild:
+  Removed obsolete (and unneeded) QT4_BUILT_WITH_USE_CHECK
 
   06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> skype-2.0.0.63.ebuild,
   skype-2.0.0.68.ebuild:



1.9                  net-im/skype/skype-2.0.0.63.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild?r1=1.8&r2=1.9

Index: skype-2.0.0.63.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- skype-2.0.0.63.ebuild	6 Oct 2009 17:23:45 -0000	1.8
+++ skype-2.0.0.63.ebuild	6 Oct 2009 18:57:51 -0000	1.9
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.8 2009/10/06 17:23:45 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.63.ebuild,v 1.9 2009/10/06 18:57:51 ayoy Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils pax-utils qt4
 
@@ -40,7 +40,7 @@
 				x11-libs/libXrandr
 				x11-libs/libXrender
 				x11-libs/libX11 )
-		!qt-static? ( x11-libs/qt-gui:4
+		!qt-static? ( x11-libs/qt-gui:4[accessibility]
 				x11-libs/qt-dbus:4
 				x11-libs/libX11
 				x11-libs/libXau
@@ -50,7 +50,6 @@
 QA_EXECSTACK="opt/skype/skype"
 
 use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
-use !qt-static && QT4_BUILT_WITH_USE_CHECK="guiaccessibility dbus"
 
 src_install() {
 	# remove mprotect() restrictions for PaX usage - see Bug 100507



1.5                  net-im/skype/skype-2.0.0.68.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild?r1=1.4&r2=1.5

Index: skype-2.0.0.68.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- skype-2.0.0.68.ebuild	6 Oct 2009 17:23:45 -0000	1.4
+++ skype-2.0.0.68.ebuild	6 Oct 2009 18:57:51 -0000	1.5
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.4 2009/10/06 17:23:45 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.68.ebuild,v 1.5 2009/10/06 18:57:51 ayoy Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils pax-utils qt4
 
@@ -40,7 +40,7 @@
 				x11-libs/libXrandr
 				x11-libs/libXrender
 				x11-libs/libX11 )
-		!qt-static? ( x11-libs/qt-gui:4
+		!qt-static? ( x11-libs/qt-gui:4[accessibility]
 				x11-libs/qt-dbus:4
 				x11-libs/libX11
 				x11-libs/libXau
@@ -50,7 +50,6 @@
 QA_EXECSTACK="opt/skype/skype"
 
 use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
-use !qt-static && QT4_BUILT_WITH_USE_CHECK="guiaccessibility dbus"
 
 src_install() {
 	# remove mprotect() restrictions for PaX usage - see Bug 100507






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-10-06 18:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-11 18:21 [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.0.0.63.ebuild skype-2.0.0.68.ebuild Ben de Groot (yngwin)
  -- strict thread matches above, loose matches on Subject: below --
2009-10-06 17:23 Dominik Kapusta (ayoy)
2009-10-06 18:57 Dominik Kapusta (ayoy)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox