Version bump (bug #392003)
authorDavide Pesavento <pesa@gentoo.org>
Sat, 3 Dec 2011 19:26:49 +0000 (19:26 +0000)
committerDavide Pesavento <pesa@gentoo.org>
Sat, 3 Dec 2011 19:26:49 +0000 (19:26 +0000)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

net-libs/telepathy-qt4/ChangeLog
net-libs/telepathy-qt4/Manifest
net-libs/telepathy-qt4/files/0.8.0_automagicness.patch [new file with mode: 0644]
net-libs/telepathy-qt4/telepathy-qt4-0.8.0.ebuild [new file with mode: 0644]

index 9b880a3d6ef159c80de937b00b0e548fe4c5be46..527fc402e880d3e4fdd72aebd761c426d1b0fc3f 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/telepathy-qt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/ChangeLog,v 1.7 2011/04/20 12:31:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/ChangeLog,v 1.8 2011/12/03 19:26:48 pesa Exp $
+
+*telepathy-qt4-0.8.0 (03 Dec 2011)
+
+  03 Dec 2011; Davide Pesavento <pesa@gentoo.org>
+  +files/0.8.0_automagicness.patch, +telepathy-qt4-0.8.0.ebuild:
+  Version bump (bug #392003)
 
 *telepathy-qt4-0.5.15 (20 Apr 2011)
 
index a5cdb8bbb4934939b126b8daafa1a1043654b320..8adb3d6831dc673d9b03ae652d4fece7eb7b00c5 100644 (file)
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 0.5.12_automagicness.patch 6917 RMD160 e9dc8451123f82436f239a2adab436e2744d9b39 SHA1 2c9592cc749055736445969a97d3ffda2b26ca18 SHA256 74585bf7d2e746a66864deb1f3858f1c1aeb63bf4c9314310b1ae40890c15f2b
+AUX 0.8.0_automagicness.patch 7516 RMD160 71daeee234927121c817a61e8f1acc1e50efaf8d SHA1 d5bd2b1b6db98b49db44d84ec409c39a322a662f SHA256 c37d92e8fe846a914a652c4db170ddbd5a9dd2f6899bc240cb89eed4797c182b
 DIST telepathy-qt4-0.5.15.tar.gz 3327150 RMD160 10c684c7baffe41a185fee08e16d32c12ab85faa SHA1 13c0e94e1368e4f3ce8c540676296a5a60991883 SHA256 ee051b5a96f0812e8749433808673a75a049d1f97d3c035b8b2b08dce5db9b6a
+DIST telepathy-qt4-0.8.0.tar.gz 4014194 RMD160 e6850de7d57c8c6bab57f381667209bfac4d3ea7 SHA1 ba34bf78b7e1b6d7bb087780d8e1709a3cf4775b SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc
 EBUILD telepathy-qt4-0.5.15.ebuild 1130 RMD160 50eec3167a13064576651813a409e4eb68f17902 SHA1 48f97116ba7e230b77ca5112b41f879a1a378670 SHA256 50491e0b617e1acd9541436634e4cd0c10662ef2630487428bd9ad403b13a8d0
-MISC ChangeLog 1741 RMD160 891382118298e46291469b87545d615c9c7bfe65 SHA1 b93196590eaa3f1c28f11f2cc85a9c89b1f6ffc5 SHA256 532d68a0161b904278446c4773bae0a9b6306be38fc27981a3dc6c88db6757ae
+EBUILD telepathy-qt4-0.8.0.ebuild 1333 RMD160 41b2ec3e6ef048c43e7ee0c37abafe11da68130b SHA1 cc3c19d4272c0c364f2a1aecfab8c9088acc5344 SHA256 2c4404827358aa5b7a1a9180d955f958488aed10d99671de22414802a41acd14
+MISC ChangeLog 1917 RMD160 ac5c1ab67bafaf949af2b775eb094a507d5f9354 SHA1 77459b460d407daa61c727298863653410d83d5d SHA256 22d9d2a4303cf55e553195849dda77d19aa55f5d1ed25f9cd962aac5aee36747
 MISC metadata.xml 335 RMD160 e68f892510261f37859207aab171783893e86e1f SHA1 756c52f911aa8c3c5487a53500828106ee6554d9 SHA256 f43ecaefe6736cbcadb34db002b505ec454ab7d0328de46c9a6795ff3c212970
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2u0hsACgkQHB6c3gNBRYd8CQCgmSrU7Pv8e0sr8AC6amNgbEAP
-UykAoL4bl6R36Kv/bJLVlD5w+u4jehJC
-=0WQC
+iQIcBAEBCgAGBQJO2nf/AAoJENXLsxwXqFxyhdkP/incbTa+m8pVVJYfVLvA8ihd
+EK7JPBr0JL7ugSHqOiSk8Bpf9xUwoytKOWBNuDR/GnO2HLr/FPGyFV6mUifp1Mh3
+ryM6ZkqornHZcQekqf+jXv2AH92ORJYefGyGBSv+SGdDRIoklLcBSZgAytL3riQE
+/jf0zRymKStF0Lp6Dbg/r94REFFTi4qeF5+4r5eCvWc/3sPT4oZRQvTbsO3ba2T+
+iML1UOF2PcP8+2p0Z6KyTF1P3jyr+fj1KflGVZPGsxUHKoisjIVzKY+k+w05MFkV
+bm8wGXMNwPS/627slewBTfmWklUc3AIiBY28VvxS0f0dwl4k/0DMO+0LhitWn0V6
+GOOycJZiM7/DQC0uodz8pvnQE4GQ3bgq9JM6dp+dNML0lmLNQ7zKPRC94qBvv0Uu
+qilnk9UzIUHEJCzh3aEEfM2cIEbRkB4dcEk6cux2EgoROdCxXGlB/h2sT4J+FV3h
+v51NYRDo5q6jXK5EjQerqy+IQA4an1wkfzlDconzRwS3TThJMzV7U2eXuJATcrTY
+iwrqDqQEUQSSAD7UThhA8ggcup6HF8GmzuBOp2Oyp0+dlg2CgfCyxK6itjaPu6ET
+zrt2TGoUVGknMr1YxkL6tkW9jqQu84S3Of09oMiPio+ro1mzuC+dNKsQqdYeiQM0
+qF1XgZJO0Oz2Ih1PW8n7
+=1axN
 -----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-qt4/files/0.8.0_automagicness.patch b/net-libs/telepathy-qt4/files/0.8.0_automagicness.patch
new file mode 100644 (file)
index 0000000..bac928d
--- /dev/null
@@ -0,0 +1,190 @@
+--- telepathy-qt4-0.8.0.orig/CMakeLists.txt    2011-12-03 19:26:01.265996011 +0100
++++ telepathy-qt4-0.8.0/CMakeLists.txt 2011-12-03 19:54:29.233643477 +0100
+@@ -84,6 +84,11 @@
+ 
+ include(MacroLogFeature)
+ 
++# options
++option(WITH_Glib "Enable building with glib features" ON)
++option(WITH_Farsight "Enable building with farsight features" ON)
++option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
++
+ # external dependencies
+ 
+ # Required dependencies
+@@ -100,31 +105,9 @@
+ 
+ add_definitions(-DQT_NO_CAST_FROM_ASCII)
+ 
+-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
+-if (ENABLE_DEBUG_OUTPUT)
++if(ENABLE_DEBUG_OUTPUT)
+     add_definitions(-DENABLE_DEBUG)
+-endif (ENABLE_DEBUG_OUTPUT)
+-
+-# Check for Qt4 Glib support
+-include(CheckCXXSourceCompiles)
+-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
+-set(CMAKE_REQUIRED_DEFINITIONS "")
+-set(CMAKE_REQUIRED_FLAGS "")
+-
+-CHECK_CXX_SOURCE_COMPILES("
+-#include <QtCore/QtGlobal>
+-int main()
+-{
+-#if defined(QT_NO_GLIB)
+-#error \"Qt was compiled with Glib disabled\"
+-#endif
+-return 0;
+-}"
+-QT4_GLIB_SUPPORT)
+-macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support"
+-                  "QtCore library using Glib's main event loop"
+-                  "http://qt.nokia.com/" FALSE ""
+-                  "Needed, together with Telepathy-Glib, to build most of the unit tests")
++endif(ENABLE_DEBUG_OUTPUT)
+ 
+ # Find python version >= 2.5
+ find_package(PythonLibrary REQUIRED)
+@@ -150,58 +133,91 @@
+ 
+ # Find GLib2, GObject, DBus and LibXml2
+ # Those are needed for the insane include dir dependency hell
+-find_package(GLIB2)
+-find_package(GObject)
+-find_package(GIO)
+-find_package(GIOUnix)
+-find_package(DBus)
+-find_package(DBusGLib)
+-find_package(LibXml2)
+-
+-# Find tp-farsight
+-set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
+-find_package(TelepathyFarsight)
+-macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
+-                  "A Framework for dealing with audio/video conferencing protocols"
+-                  "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
+-                  "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples")
+-
+-# Find GStreamer
+-find_package(GStreamer)
+-macro_log_feature(GSTREAMER_FOUND "GStreamer"
+-                  "An open source multimedia framework"
+-                  "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples"
+-                  "http://www.gstreamer.net/" FALSE)
+-
+-# Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
+-if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+-    set (FARSIGHT_COMPONENTS_FOUND 1)
+-else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+-    set (FARSIGHT_COMPONENTS_FOUND 0)
+-endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
++if(WITH_Farsight)
++      find_package(GLIB2 REQUIRED)
++      find_package(GObject REQUIRED)
++      find_package(DBus REQUIRED)
++      find_package(DBusGLib REQUIRED)
++      find_package(LibXml2 REQUIRED)
++
++      # Find tp-farsight
++      set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
++      find_package(TelepathyFarsight REQUIRED)
++      macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
++                                        "A Framework for dealing with audio/video conferencing protocols"
++                                        "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
++                                        "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples")
++
++      # Find GStreamer
++      find_package(GStreamer REQUIRED)
++      macro_log_feature(GSTREAMER_FOUND "GStreamer"
++                                        "An open source multimedia framework"
++                                        "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples"
++                                        "http://www.gstreamer.net/" FALSE)
++
++      # Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
++      if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
++              set (FARSIGHT_COMPONENTS_FOUND 1)
++      else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
++              set (FARSIGHT_COMPONENTS_FOUND 0)
++      endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
++else(WITH_Farsight)
++      set(FARSIGHT_COMPONENTS_FOUND 0)
++endif(WITH_Farsight)
+ 
+ # Find telepathy-glib
+-set(TELEPATHY_GLIB_MIN_VERSION 0.15.1)
+-find_package(TelepathyGlib)
+-macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
+-                  "Glib bindings for Telepathy"
+-                  "http://telepathy.freedesktop.org/" FALSE "0.15.1"
+-                  "Needed, together with Qt Glib integration, to build most of the unit tests")
+-
+-find_program(GLIB_GENMARSHAL glib-genmarshal)
+-
+-# Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found
+-if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+-    set(ENABLE_TP_GLIB_TESTS 1)
+-    if(GIO_FOUND AND GIOUNIX_FOUND)
+-        set(ENABLE_TP_GLIB_GIO_TESTS 1)
+-    else(GIO_FOUND AND GIOUNIX_FOUND)
+-        set(ENABLE_TP_GLIB_GIO_TESTS 0)
+-    endif(GIO_FOUND AND GIOUNIX_FOUND)
+-else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+-    set(ENABLE_TP_GLIB_TESTS 0)
+-    set(ENABLE_TP_GLIB_GIO_TESTS 0)
+-endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
++if(WITH_Glib)
++      # Check for Qt4 Glib support
++      include(CheckCXXSourceCompiles)
++      set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
++      set(CMAKE_REQUIRED_DEFINITIONS "")
++      set(CMAKE_REQUIRED_FLAGS "")
++
++      CHECK_CXX_SOURCE_COMPILES("
++      #include <QtCore/QtGlobal>
++      int main()
++      {
++      #if defined(QT_NO_GLIB)
++      #error \"Qt was compiled with Glib disabled\"
++      #endif
++      return 0;
++      }"
++      QT4_GLIB_SUPPORT)
++      macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support"
++                                        "QtCore library using Glib's main event loop"
++                                        "http://qt.nokia.com/" FALSE ""
++                                        "Needed, together with Telepathy-Glib, to build most of the unit tests")
++
++      find_package(GLIB2 REQUIRED)
++      find_package(GIO)
++      find_package(GIOUnix)
++      find_package(DBus REQUIRED)
++
++      set(TELEPATHY_GLIB_MIN_VERSION 0.15.1)
++      find_package(TelepathyGlib REQUIRED)
++      macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
++                                        "Glib bindings for Telepathy"
++                                        "http://telepathy.freedesktop.org/" FALSE "0.15.1"
++                                        "Needed, together with Qt Glib integration, to build most of the unit tests")
++
++      find_program(GLIB_GENMARSHAL glib-genmarshal)
++      # Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found
++      if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
++              set(ENABLE_TP_GLIB_TESTS 1)
++              if(GIO_FOUND AND GIOUNIX_FOUND)
++                      set(ENABLE_TP_GLIB_GIO_TESTS 1)
++              else(GIO_FOUND AND GIOUNIX_FOUND)
++                      set(ENABLE_TP_GLIB_GIO_TESTS 0)
++              endif(GIO_FOUND AND GIOUNIX_FOUND)
++      else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
++              set(ENABLE_TP_GLIB_TESTS 0)
++              set(ENABLE_TP_GLIB_GIO_TESTS 0)
++      endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
++else(WITH_Glib)
++      set(ENABLE_TP_GLIB_TESTS 0)
++      set(ENABLE_TP_GLIB_GIO_TESTS 0)
++endif(WITH_Glib)
++
+ 
+ # Add the source subdirectories
+ add_subdirectory(TelepathyQt4)
diff --git a/net-libs/telepathy-qt4/telepathy-qt4-0.8.0.ebuild b/net-libs/telepathy-qt4/telepathy-qt4-0.8.0.ebuild
new file mode 100644 (file)
index 0000000..6965d21
--- /dev/null
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/telepathy-qt4-0.8.0.ebuild,v 1.1 2011/12/03 19:26:48 pesa Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+
+inherit python base cmake-utils
+
+DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug farsight glib"
+
+RDEPEND="
+       dev-python/dbus-python
+       >=x11-libs/qt-core-4.6.0:4[glib?]
+       >=x11-libs/qt-dbus-4.6.0:4
+       farsight? (
+               dev-libs/dbus-glib
+               dev-libs/libxml2
+               media-libs/gstreamer
+               net-libs/telepathy-farsight
+               >=net-libs/telepathy-glib-0.15.1
+       )
+       glib? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}
+       dev-libs/libxslt
+       dev-util/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PV}_automagicness.patch" )
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
+src_prepare() {
+       base_src_prepare
+
+       sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die
+}
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_enable debug DEBUG_OUTPUT)
+               $(cmake-utils_use_with glib)
+               $(cmake-utils_use_with farsight)
+       )
+       cmake-utils_src_configure
+}