diff --git a/dev-cpp/wt/Manifest b/dev-cpp/wt/Manifest index 23c0730d69..6f6d27988b 100644 --- a/dev-cpp/wt/Manifest +++ b/dev-cpp/wt/Manifest @@ -1,2 +1,2 @@ -DIST wt-4.11.0.tar.gz 10563042 BLAKE2B c49427437298cccc930017d3f03badc33cfcacd370e88b0d18e96a0d4302843fac161d02f3af012cda26a24bac2585329d620324f00cdebad1e78cf59217608d SHA512 67557e39f97871855250d38434b1260d507d9bc27fe0d64e5bf3176eedc3b02269bb3167a9e31d61a30817a852e98fd594672bc5e0debd807523cc5f8db4d17f DIST wt-4.11.1.tar.gz 10573506 BLAKE2B 832088ba70af307d2abc374c384f5c41920f07439b43e6a53705c34d634e4b412fb075342883f6bf6dda7418ff4277bacd264133afc61567b29ba9bcdfb92257 SHA512 b3afab7327abc7a61ec8963af79bd9b3a23127031416fda4115db74287c130a09d5dd99465c0643e28ef9f2feaabe6ea51a8a22f698ae487243c2ae0e635a412 +DIST wt-4.11.2.tar.gz 10581246 BLAKE2B 6b1ac3e53a8eab572354f4a43ed20cf92ce1049f79aae0333730fb283cd3c4fc274f8ebe94a08fffeafb73a1ccccf1771d180189ef6d825336172ab891992cbc SHA512 e512c88616878b8fa3b992aa9d2f232d994ee6108607af4e5d511a2fecd7ae35cf33a63435a0ff356df715b386f2061731dcfb28c529bc43c901f17787686f34 diff --git a/dev-cpp/wt/wt-4.11.0.ebuild b/dev-cpp/wt/wt-4.11.2.ebuild similarity index 90% rename from dev-cpp/wt/wt-4.11.0.ebuild rename to dev-cpp/wt/wt-4.11.2.ebuild index 9db9580fc8..ce1453eaaa 100644 --- a/dev-cpp/wt/wt-4.11.0.ebuild +++ b/dev-cpp/wt/wt-4.11.2.ebuild @@ -21,7 +21,7 @@ DEPEND=" pango? ( x11-libs/pango ) postgres? ( dev-db/postgresql ) ssl? ( dev-libs/openssl ) - dev-libs/boost:= + <=dev-libs/boost-1.86.0:= media-libs/libharu media-gfx/graphicsmagick[jpeg,png] sys-libs/zlib @@ -31,18 +31,13 @@ RDEPEND="${DEPEND}" BDEPEND=" doc? ( app-text/doxygen[dot] - dev-qt/qtchooser - dev-qt/qthelp + dev-qt/qttools[qdoc] ) " -# for qt6 dev-qt/qttools[qdoc] PATCHES=( "${FILESDIR}/wt-no-rundir.patch") src_configure() { - # TODO - #-DENABLE_QT6=$(usex qt6) - local mycmakeargs=( -DLIB_INSTALL_DIR=$(get_libdir) -DBUILD_EXAMPLES=OFF @@ -56,7 +51,8 @@ src_configure() { -DENABLE_FIREBIRD=$(usex firebird) -DENABLE_MYSQL=$(usex mysql) -DENABLE_QT4=OFF - -DENABLE_QT5=ON + -DENABLE_QT5=OFF + -DENABLE_QT6=ON -DENABLE_SAML=ON -DENABLE_OPENGL=$(usex opengl) ) diff --git a/dev-python/PythonQwt/Manifest b/dev-python/PythonQwt/Manifest index 982d64ce99..1786b65c4e 100644 --- a/dev-python/PythonQwt/Manifest +++ b/dev-python/PythonQwt/Manifest @@ -1,3 +1,3 @@ DIST pythonqwt-0.12.7.tar.gz 1217648 BLAKE2B 6c9dbaa893d6124ace07f9749d8b668fc5627269e3cabfab129fc04e3a511c971a2bd34d0bfc33da96715f7f8601e6d2d179584e8166f876296dc13d536ca710 SHA512 87af1d62e98798f5f616b7b008d704d943ae3c662b254f3243b3d9f4e5efab2f68b28c4820be6894b35852c9a5c14fa27c07868a28aacc6c9cd10ed7a674cfc2 -DIST pythonqwt-0.14.2.tar.gz 1218008 BLAKE2B 7cf8e4cb5226c8c14b97000ac46d31171d111f57eeb3ecd50948746ada015e2e54bb912a93b408f8c9a3bab80c94ff7ffa7f622f8ebdca0d78a7c376072ace00 SHA512 557fed50a7d07daaeb061578c3adb08524843fb13d20ba376c65605df63ed2bc171fc536c593f146be0eca0fe9e9705e18dacb868f33178d71b4c53513a4ded8 DIST pythonqwt-0.14.3.tar.gz 1218724 BLAKE2B e0c157167aa85b8f437b2b19fbe95524ac76168f79b536623f7311c441d68113ed931b30073598e6c0cee813f2ba73a1378caa5dddae66adfb53aed3a863313d SHA512 5fd51fd4f6e859bc5da23b2eabb5eeafa496ef6b33dce56e51a2d6abdf7184d98e390395788def8e3636938e619e6a6aee3a1b67d9c8058de960e50d437d1781 +DIST pythonqwt-0.14.4.tar.gz 1218690 BLAKE2B 91ecc9efa1855004c50639978892f0c43faa0531edb468cac3d50cdb6c792848278cbf8d5de5f500e98368c1ebfcadf8f78061cf49861021520128bf56367f27 SHA512 809fe79c9fd132c8a2173183f0b101e8c1600f95aa935dc0da2609de678abe5c64b8842b70c0d53978daf68ec36b7ccacbcc86b01e7ecce9a38425bbc48300ab diff --git a/dev-python/PythonQwt/PythonQwt-0.14.2.ebuild b/dev-python/PythonQwt/PythonQwt-0.14.4.ebuild similarity index 100% rename from dev-python/PythonQwt/PythonQwt-0.14.2.ebuild rename to dev-python/PythonQwt/PythonQwt-0.14.4.ebuild diff --git a/net-wireless/btscreenlocker/Manifest b/net-wireless/btscreenlocker/Manifest index cf39c9f387..f6902250e8 100644 --- a/net-wireless/btscreenlocker/Manifest +++ b/net-wireless/btscreenlocker/Manifest @@ -1,4 +1 @@ -DIST BtScreenLocker-1.6.3.tar.gz 61599 BLAKE2B cc04095e769fe4fabab83b695652afc044a87c63b4205bd6300ae1e3504a083479da20f92d71edff0d1aaa371ecf1c33b6692e6df4742c9bee48308a1d049863 SHA512 1f0359f1cbebab89acc9e539119513b5cde77b1ddc99ad4bcb2c5ea7e8c82c72afed90297f925ed6b113e0f910c2966dd37b92190a76ce81b215a5117fadd96c -DIST BtScreenLocker-1.6.5.tar.gz 61876 BLAKE2B e71b13f5c5a4407e76330bac64f27f84ed6338827d3f05dd9b53a4ddaad701688c8d87d02c0507b06f5d718532659de3ac50ead31fd033703052214141ff9a93 SHA512 9d5de0e9e1f7da6ba4883a0f0defe9dc3c57daacea99b0cbda0202907d1f3dc934022ebbfd332d2c4694eb35c170a7029c30d83b2dec5de8ce218fac7064ee7f -DIST BtScreenLocker-1.7.0.tar.gz 63124 BLAKE2B 2491696501e9ed9c0a424a6835082b30efcb60d125a0178e2b517207c339d16a972e7c6bea414839c0d6a4a185af483dafafe0e6037646c21e49ecde79b855c6 SHA512 e363e155e86c9105ca0ac692f2f50f8f07a47b9b27160441b4a4292130cc8c2e7dc1f706187dad804a3a2dbe1e241d62891328e8a12290c6f16bb3206187445e DIST BtScreenLocker-1.8.1.tar.gz 64229 BLAKE2B 9896f35123f95ee22773fe5213b0aff46840554a9833014a047d978357b1fde6983f86641f7900c0be68fd45862ed9d5d50b34d572d4844241e460247b1a6426 SHA512 e24c280946fdf250ece7cdfedc24fb7b3f4bbc34921d80e996e61ef18ee4450174ee09e0812056573b960593bdb8f8ac6658472e9c604b0c976ec058235c3f2c diff --git a/net-wireless/btscreenlocker/btscreenlocker-1.6.5.ebuild b/net-wireless/btscreenlocker/btscreenlocker-1.6.5.ebuild deleted file mode 100644 index 328c9843a6..0000000000 --- a/net-wireless/btscreenlocker/btscreenlocker-1.6.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2024 Brayan M. Salazar -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Daemon to lock your screen when Bluetooth trusted devices go away." -HOMEPAGE="https://github.com/brookiestein/BtScreenLocker" -SRC_URI="https://github.com/brookiestein/BtScreenLocker/archive/refs/tags/${PV}.tar.gz -> BtScreenLocker-${PV}.tar.gz" -S="${WORKDIR}/BtScreenLocker-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" -dev-qt/linguist-tools:5 -dev-qt/qtbluetooth:5 -dev-qt/qtdbus:5 -dev-qt/qtwidgets:5 ->=net-wireless/bluez-5.76 -" -RDEPEND="${DEPEND}" -BDEPEND=" ->=dev-build/cmake-3.28 -virtual/pkgconfig -" diff --git a/net-wireless/btscreenlocker/btscreenlocker-1.7.0-r1.ebuild b/net-wireless/btscreenlocker/btscreenlocker-1.7.0-r1.ebuild deleted file mode 100644 index 5dbf7c19c8..0000000000 --- a/net-wireless/btscreenlocker/btscreenlocker-1.7.0-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2024 Brayan M. Salazar -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Daemon to lock your screen when Bluetooth trusted devices go away." -HOMEPAGE="https://github.com/brookiestein/BtScreenLocker" -SRC_URI="https://github.com/brookiestein/BtScreenLocker/archive/refs/tags/${PV}.tar.gz -> BtScreenLocker-${PV}.tar.gz" -S="${WORKDIR}/BtScreenLocker-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" -dev-qt/linguist-tools:5 -dev-qt/qtbluetooth:5 -dev-qt/qtdbus:5 -dev-qt/qtwidgets:5 ->=net-wireless/bluez-5.76 -" -RDEPEND="${DEPEND} -dev-qt/qtcore:5 -dev-qt/qtgui:5" -BDEPEND=" ->=dev-build/cmake-3.28 -virtual/pkgconfig -" diff --git a/net-wireless/btscreenlocker/btscreenlocker-1.6.3.ebuild b/net-wireless/btscreenlocker/btscreenlocker-1.8.1-r1.ebuild similarity index 51% rename from net-wireless/btscreenlocker/btscreenlocker-1.6.3.ebuild rename to net-wireless/btscreenlocker/btscreenlocker-1.8.1-r1.ebuild index 328c9843a6..a9efb13992 100644 --- a/net-wireless/btscreenlocker/btscreenlocker-1.6.3.ebuild +++ b/net-wireless/btscreenlocker/btscreenlocker-1.8.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2024 Brayan M. Salazar +# Copyright 2024-2025 Brayan M. Salazar # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake xdg DESCRIPTION="Daemon to lock your screen when Bluetooth trusted devices go away." HOMEPAGE="https://github.com/brookiestein/BtScreenLocker" @@ -15,14 +15,26 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" -dev-qt/linguist-tools:5 -dev-qt/qtbluetooth:5 -dev-qt/qtdbus:5 -dev-qt/qtwidgets:5 ->=net-wireless/bluez-5.76 + dev-qt/qtconnectivity:6[bluetooth] + dev-qt/qtbase:6[dbus,widgets] + >=net-wireless/bluez-5.76:= " RDEPEND="${DEPEND}" BDEPEND=" ->=dev-build/cmake-3.28 -virtual/pkgconfig + >=dev-build/cmake-3.28 + dev-qt/qttools:6[linguist] + virtual/pkgconfig " + +src_prepare() { + cmake_src_prepare + # drop Qt5 support + sed -i '/Qt5/d' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DQT_VERSION_MAJOR=6 + ) + cmake_src_configure +} diff --git a/net-wireless/btscreenlocker/btscreenlocker-1.8.1.ebuild b/net-wireless/btscreenlocker/btscreenlocker-1.8.1.ebuild deleted file mode 100644 index 5dbf7c19c8..0000000000 --- a/net-wireless/btscreenlocker/btscreenlocker-1.8.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2024 Brayan M. Salazar -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Daemon to lock your screen when Bluetooth trusted devices go away." -HOMEPAGE="https://github.com/brookiestein/BtScreenLocker" -SRC_URI="https://github.com/brookiestein/BtScreenLocker/archive/refs/tags/${PV}.tar.gz -> BtScreenLocker-${PV}.tar.gz" -S="${WORKDIR}/BtScreenLocker-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" -dev-qt/linguist-tools:5 -dev-qt/qtbluetooth:5 -dev-qt/qtdbus:5 -dev-qt/qtwidgets:5 ->=net-wireless/bluez-5.76 -" -RDEPEND="${DEPEND} -dev-qt/qtcore:5 -dev-qt/qtgui:5" -BDEPEND=" ->=dev-build/cmake-3.28 -virtual/pkgconfig -" diff --git a/profiles/package.mask b/profiles/package.mask index 75b0bda08d..702f1100a7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,12 @@ # New entries go on top. +# Takuya Wakazono (2025-01-23) +# Depends on dev-qt/qtbluetooth:5, which is masked in ::gentoo and will +# be removed. +# Removal on 2025-02-23. +gui-apps/coretoppings + # Julien Roy # Depends on dev-python/zenlib-3.1.2 which isn't yet in tree # https://github.com/gentoo/gentoo/pull/39922