summaryrefslogtreecommitdiff
path: root/net-libs/telepathy-qt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-libs/telepathy-qt
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'net-libs/telepathy-qt')
-rw-r--r--net-libs/telepathy-qt/Manifest7
-rw-r--r--net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch21
-rw-r--r--net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch17
-rw-r--r--net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch37
-rw-r--r--net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild57
-rw-r--r--net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild7
6 files changed, 6 insertions, 140 deletions
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index 684762b3c5db..8fc974f9c57f 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -1,8 +1,3 @@
-AUX telepathy-qt-0.9.6.1-qtpath.patch 935 BLAKE2B ee54f49734a52387c68c60ebd32d2adf189340d845eb9a4989bea45f79901bda3fbec6ffb32364527675882aca1ee4f972d6cca1c2131e8cac550b5d8e2f8de9 SHA512 8b1351e005db5b85e39bc56e666dff000f7acc1bf1cf1d1df9577b8da1f7fbde6ee4a0abd0c81ba757aa49c8a30efb9fa3e46561efd9e2c64d69ee818b80a42f
-AUX telepathy-qt-0.9.6.1-yes-release.patch 578 BLAKE2B fd8581e60b4f526681946c7c45638c85f3a5ad0448d71dbdfd2b4a8a5f72f423ae2d8514c2459f817c9b0aff35db8c257d827e6e25f75037fd867df18fcb3e36 SHA512 c0c3e3e6b698aa5410d33653f36a1dac044054fa03830f1c78c1a1d82aa74e24ef84d4ccfc8b3ce295e655f2618aa318c863b8b49303097d5774e789efb4cc80
-AUX telepathy-qt-0.9.7-deps.patch 2017 BLAKE2B f8f0d4eb3362b1b0d4fb628dfa773bced0eebaa359340f6b95d0d37077083f90979dd557775cc5a44b74c0b78f4741b5c03b589feedff0b0d32d51f3883b6513 SHA512 202974d14ee316e713138e5ee88a5b6ec4f613af567b83ac4dc4aec8bc39dcb6cd65d1be6724189e48cccfc526ad8bd7151a7a5420a5d5f44071ccd50a0ecae1
-DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877
DIST telepathy-qt-0.9.8.tar.gz 6448686 BLAKE2B 7554b812c35a09aabc0ff92fea43f633b5c2f87784c8e7b387545b31c1c92eb02f9e416930c635202fe0205c4e26c1fd63c3b4a668cf0ceeb602d8a777891cd9 SHA512 fad662c02417c8e4e239d438ea3549226e589442aea8418c8922a6b78ff88422a36c1cc0d2e3591240fac115390a7fbdb1b4deea98187051cc811175b60b9e8b
-EBUILD telepathy-qt-0.9.7-r1.ebuild 1143 BLAKE2B fd407ea1f38641b790e182e87c953a4ede015132f92354980f48abd96d2e4c9e2b4ccf941ee234b913b09a687515d1e80309de853913c03f6eddf023d44497ad SHA512 ad539634ee8081f27018004d7ef2a145148f9fc199c3367c4108a859fd32216f785fe2934257315f6277852abcf7e7ac2ee9bc129a736ccc5338c0b713e15ebc
-EBUILD telepathy-qt-0.9.8.ebuild 1441 BLAKE2B 5dcf76dc5c26d84d99433dc915133386e8a93bd2e5733a373bc24f614ba3eec6643013f6537a8b3d8da9ec9f582afdf576f45efe885a97bf46ec264a255cb732 SHA512 792c6f4d3beafa3f3bf66aa889d599f4fd5e67f21942aae2ed8d951f27ca6fdb53fec6c07983d015e0f8b4f95dc556f8fbe5d3ce861392761be2b90373d646f1
+EBUILD telepathy-qt-0.9.8.ebuild 1484 BLAKE2B 0e09cc5d671686c52243669f02fb644fda4b76e6f384b7b2db514e5c0196deb4fdda06c919c095f024b3c2b9150d806573a28af07c5692487b0f414cf7d38dba SHA512 25a87c7168cbde43a73efd18c1a2fdd2efd8e7602fe1ca6a8db759e18a733e2d78328125427ca2c77f5d43999dd9b38646c38f5a40654f965d21711548c9b4ce
MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
deleted file mode 100644
index a14e1da1a658..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-qtpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -19,7 +19,7 @@
- IF(NOT QT5_INSTALLED)
- IF(NOT QT_QMAKE_EXECUTABLE)
- FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5
-- PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
-+ PATHS /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin /usr/bin NO_DEFAULT_PATH)
- SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
- ENDIF(NOT QT_QMAKE_EXECUTABLE)
-
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
deleted file mode 100644
index 97a880c72ca7..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.6.1-yes-release.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
-index d34b24d..eb51454 100644
---- a/cmake/modules/TelepathyDefaults.cmake
-+++ b/cmake/modules/TelepathyDefaults.cmake
-@@ -59,11 +59,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- set(DEPRECATED_DECLARATIONS_FLAGS)
- endif (CXX_DEPRECATED_DECLARATIONS)
-
-- if(${TP_QT_NANO_VERSION} EQUAL 0)
-- set(NOT_RELEASE 0)
-- else(${TP_QT_NANO_VERSION} EQUAL 0)
-- set(NOT_RELEASE 1)
-- endif(${TP_QT_NANO_VERSION} EQUAL 0)
-+ set(NOT_RELEASE 0)
-
- set(desired
- all
diff --git a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch b/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
deleted file mode 100644
index 033ece79bb5e..000000000000
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.7-deps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindQt5.cmake 2016-06-12 13:04:05.000000000 +0200
-+++ b/cmake/modules/FindQt5.cmake 2018-04-25 18:04:28.351188748 +0200
-@@ -22,8 +22,6 @@
- # QT_QTDBUS_LIBRARY The QtDBus library
- # QT_QTGUI_LIBRARY The QtGui library
- # QT_QTNETWORK_LIBRARY The QtNetwork library
--# QT_QTTEST_LIBRARY The QtTest library
--# QT_QTWIDGETS_LIBRARY The QtWidgets library
- # QT_QTXML_LIBRARY The QtXml library
- #
- # also defined, but NOT for general use are
-@@ -65,23 +63,19 @@
- find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
--find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED)
--find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED)
- find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED)
-
- # Copy includes and library names into the same style as pkgconfig used for Qt4
--set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
-+set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
-
- set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES})
- set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES})
- set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES})
- set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES})
--set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES})
--set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES})
- set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES})
-
--set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY})
-+set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY})
-
- SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR})
- SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
deleted file mode 100644
index 493cfb62bd24..000000000000
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug farstream"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- farstream? (
- >=net-libs/telepathy-farstream-0.2.2
- >=net-libs/telepathy-glib-0.18.0
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.9.6.1-yes-release.patch"
- "${FILESDIR}/${PN}-0.9.6.1-qtpath.patch"
- "${FILESDIR}/${P}-deps.patch"
-)
-
-# bug 549448 - last checked with 0.9.7
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESIRED_QT_VERSION=5
- -DENABLE_DEBUG_OUTPUT=$(usex debug)
- -DENABLE_FARSTREAM=$(usex farstream)
- -DENABLE_TESTS=OFF
- -DENABLE_EXAMPLES=OFF
- )
- cmake-utils_src_configure
-}
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
index 9df248fe4b35..1f505982cf39 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
@@ -12,9 +12,11 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="debug farstream test"
+REQUIRED_USE="test? ( farstream )"
+
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -44,11 +46,12 @@ BDEPEND="${PYTHON_DEPS}
RESTRICT="!test? ( test )"
python_check_deps() {
+ use test || return 0
has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
}
pkg_setup() {
- use test && python-any-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_configure() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 13:43:18 +0000