From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- x11-libs/Manifest.gz | Bin 20342 -> 20341 bytes x11-libs/gdk-pixbuf-xlib/Manifest | 2 +- .../gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild | 12 +- x11-libs/gdk-pixbuf/Manifest | 4 +- x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild | 132 --------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild | 41 +++---- x11-libs/libX11/Manifest | 2 + x11-libs/libX11/libX11-1.7.2.ebuild | 40 +++++++ x11-libs/libdrm/Manifest | 4 +- x11-libs/libdrm/libdrm-2.4.106.ebuild | 38 ++---- x11-libs/libdrm/libdrm-9999.ebuild | 38 ++---- x11-libs/libnotify/Manifest | 4 +- x11-libs/libnotify/libnotify-0.7.8.ebuild | 8 +- x11-libs/libnotify/libnotify-0.7.9.ebuild | 8 +- x11-libs/libvdpau/Manifest | 4 +- x11-libs/libvdpau/libvdpau-1.4.ebuild | 14 +-- x11-libs/libvdpau/libvdpau-99999.ebuild | 14 +-- x11-libs/libxkbcommon/Manifest | 2 +- x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild | 10 +- x11-libs/pango/Manifest | 2 +- x11-libs/pango/pango-1.48.5-r1.ebuild | 83 +++++++++++++ x11-libs/pango/pango-1.48.5.ebuild | 97 --------------- x11-libs/pixman/Manifest | 4 +- x11-libs/pixman/pixman-0.40.0.ebuild | 12 +- x11-libs/pixman/pixman-9999.ebuild | 12 +- x11-libs/vte/Manifest | 4 +- x11-libs/vte/vte-0.64.1.ebuild | 2 +- x11-libs/vte/vte-0.64.2.ebuild | 89 ++++++++++++++ x11-libs/xapps/Manifest | 8 +- x11-libs/xapps/metadata.xml | 4 - x11-libs/xapps/xapps-1.8.9.ebuild | 92 -------------- x11-libs/xapps/xapps-2.0.6.ebuild | 8 +- x11-libs/xapps/xapps-2.2.1.ebuild | 93 +++++++++++++++ 33 files changed, 393 insertions(+), 494 deletions(-) delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild create mode 100644 x11-libs/libX11/libX11-1.7.2.ebuild create mode 100644 x11-libs/pango/pango-1.48.5-r1.ebuild delete mode 100644 x11-libs/pango/pango-1.48.5.ebuild create mode 100644 x11-libs/vte/vte-0.64.2.ebuild delete mode 100644 x11-libs/xapps/xapps-1.8.9.ebuild create mode 100644 x11-libs/xapps/xapps-2.2.1.ebuild (limited to 'x11-libs') diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz index 2e9675dd30df..f2b92d093df4 100644 Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest index 07ae0f28c11d..9108a74b4a78 100644 --- a/x11-libs/gdk-pixbuf-xlib/Manifest +++ b/x11-libs/gdk-pixbuf-xlib/Manifest @@ -1,3 +1,3 @@ DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37 -EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 970 BLAKE2B cccb15681884f89c17adc774b2daead5c7b70328921b1c01c279996f71e3345882abdcc59a2f21fcceec539f7bc74b93cb18ccfb4e4536af0b18a84cf841c569 SHA512 32d05d0d7ec4911b3d4c81e346a533009c217c21ce364bbec5e4e7bfff00f9bd789741d8570d9f73d2f6410e9aede6c88723f85bc2ab0505231b35a51d3cf788 +EBUILD gdk-pixbuf-xlib-2.40.2.ebuild 846 BLAKE2B f2666e904b8d6f4c88346389cc3892ec2b41a4bc93c954057dae57924d4929e227de2d983107c26299b67c33e852759bd7eb2f16a455a0662057da68dc4be399 SHA512 85cd7e25d1fa3b8cd2c9f7ac8698bfa9e414c70ed7b883580779731b8471ab1276012b0a84096d3c60d7726e5440213bf16c469897e19b1cc9fa0435295099d5 MISC metadata.xml 336 BLAKE2B b741dfbd8af9655d14c9d5794d0a421a0309b66a13c2d8e5800749b1acb3b68bc8084599fdb76a652e5cb2892d2206eb92a4d2915281089ad0e46022b59d3b1b SHA512 1af76541baa1ab105fa434b4caef8a0ca5e5caaad5be33823a7885f850836a195666f98e453e1c90e06aa3d869feba1383e49b3629a3672c4e5f4e8cdc344962 diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild index aaf5f014db33..bb9698575a4c 100644 --- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild +++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit gnome.org meson multilib-minimal +inherit gnome.org meson-multilib DESCRIPTION="Deprecated Xlib integration for GdkPixbuf" HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib" @@ -28,15 +28,7 @@ BDEPEND=" multilib_src_configure() { local emesonargs=( - -Dgtk-doc="$(multilib_native_usex gtk-doc true false)" + $(meson_native_use_bool gtk-doc) ) meson_src_configure } - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index fcca38905b52..b244de0b72c1 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,6 +1,4 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d -DIST gdk-pixbuf-2.42.4.tar.xz 7534896 BLAKE2B 87224c13a83848616ef52e65580239fcb4b81ccf2ab9e9cfdb55621c8b2a5b5c97ee152a83cbd1774bf3f868c6ce3779838c72877d2a5aa14d6cafad19f2d022 SHA512 b1eca16719e749d111c33592892ab18e2a1dc5f69a16762860bb54e0c97f535d7049fc388ce9daa025153ff2af56a367d8b164fa4025ee9a0131825a6108f772 DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d -EBUILD gdk-pixbuf-2.42.4.ebuild 3501 BLAKE2B d3a9f64e4afb20f77bd38857f04ffe89c2a807e2bf215a9060f89834befab33651f2d5ae472947f615a4ba24072d43ecdd413d61f0247e323ee87d309e6befe1 SHA512 2efad5959ea0c2d9e4795ecfe3df94277ce1e7269f09236e8cf2d84eb32f10ab0dd36ed4cd0f55336ed058467674c323d7bd6d2ad549073bbe2f17c8f28317b6 -EBUILD gdk-pixbuf-2.42.6.ebuild 3501 BLAKE2B d3a9f64e4afb20f77bd38857f04ffe89c2a807e2bf215a9060f89834befab33651f2d5ae472947f615a4ba24072d43ecdd413d61f0247e323ee87d309e6befe1 SHA512 2efad5959ea0c2d9e4795ecfe3df94277ce1e7269f09236e8cf2d84eb32f10ab0dd36ed4cd0f55336ed058467674c323d7bd6d2ad549073bbe2f17c8f28317b6 +EBUILD gdk-pixbuf-2.42.6.ebuild 3467 BLAKE2B e1934dd2c398046a273ae1928f66fb1d6d9dacff34a414529febe94ee286046ab43ca36ca644abc81a45735b7e5fed3d8d705b0056335463f5425c342bbdb975 SHA512 7a4a174301713b54748e54db5ba835af3840e0044b5fbe80c313533c1919e3b217f05ebbb69907e8e659d2e6664f4a9d04c6cc2b22f0f5478c64d31a945f8d4e MISC metadata.xml 331 BLAKE2B 4d198ee50a72d8d34a4cce94c2c7fecccf3fd4918b3100e182bdea1b80132f6773ac7d741ce5d55faef04c22158f8ea6b6ebff10908b8ffcc1f6d1e0caa15837 SHA512 3fe8410456df610566e862c010f9f5a3eb407fb72a842ab22e77d9400c7be98798296d2eab93ab2c97042779c0c5a19df1ad7e6c4ba71f82e17901cefcc4fff4 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild deleted file mode 100644 index 00c3b1618014..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.4.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -DEPEND=" - >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -RDEPEND="${DEPEND} - ! libpng15 upgrade - # See upstream bug #667068 - # First check that the pattern is present, to catch upstream changes on bumps, - # because sed doesn't return failure code if it doesn't do any replacements - grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die -} - -multilib_src_configure() { - local emesonargs=( - -Dpng=true - $(meson_use tiff) - $(meson_use jpeg) - -Dbuiltin_loaders=png - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc gtk_docs) - $(meson_feature introspection) - -Dman=true - ) - else - emesonargs+=( - -Dgtk_doc=false - -Dintrospection=disabled - -Dman=false - ) - fi - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -} - -multilib_src_install() { - meson_src_install -} - -pkg_preinst() { - xdg_pkg_preinst - - multilib_pkg_preinst() { - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" - - if [[ -e ${EROOT}/${cache} ]]; then - cp "${EROOT}"/${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - - multilib_foreach_abi multilib_pkg_preinst - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - xdg_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild index 00c3b1618014..146867dc375b 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg +inherit gnome.org gnome2-utils meson-multilib multilib xdg DESCRIPTION="Image loading library for GTK+" HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" @@ -30,8 +30,10 @@ BDEPEND=" dev-libs/glib:2 dev-libs/libxslt dev-util/glib-utils - gtk-doc? ( >=dev-util/gtk-doc-1.20 - app-text/docbook-xml-dtd:4.3 ) + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + dev-util/gi-docgen + ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=dev-util/meson-0.55.3 @@ -68,33 +70,20 @@ multilib_src_configure() { #native_windows_loaders -Dinstalled_tests=false -Dgio_sniffing=true + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_feature introspection) + $(meson_native_true man) ) - if multilib_is_native_abi; then - emesonargs+=( - $(meson_use gtk-doc gtk_docs) - $(meson_feature introspection) - -Dman=true - ) - else - emesonargs+=( - -Dgtk_doc=false - -Dintrospection=disabled - -Dman=false - ) - fi - meson_src_configure -} -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test + meson_src_configure } -multilib_src_install() { - meson_src_install +multilib_src_install_all() { + if use gtk-doc; then + mkdir "${ED}"/usr/share/doc/${PF}/html || die + mv "${ED}"/usr/share/doc/{${PN}/,${PF}/html/} || die + mv "${ED}"/usr/share/doc/{gdk-pixdata/,${PF}/html/} || die + fi } pkg_preinst() { diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index 2cd6b9b4e5c8..0bc15e5847f6 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,5 +1,7 @@ DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d +DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed EBUILD libX11-1.7.1.ebuild 933 BLAKE2B 3f04d4391f7a64679b7a10aeb3f68b1178ad9bf6389bd6607fda2cb654694a9b862da89856dc7e60e951a11908f065ca269a829f7181bf7b20300ba7dee73fba SHA512 8dc77dae5065e805a0f8af0c0f2c95c3c2541fc9b5cc19decc064cda661640673ecc2d8ca56daeb95e0ff1618fdd109376f6d0b13f7d54022789afe051e76ff7 +EBUILD libX11-1.7.2.ebuild 940 BLAKE2B ea5def42121b86284e0e2b5bf5f8aa65d05d39eeb5c15f90b86a2dff0fb164b8d4b4e640f0688a9d615ac910ba87edc325e5f008463833459dc7dc57a9e1d7bd SHA512 ad1d7ba5efde59606e7d9a7904d3cadbe5f7b45d21d57ce39266703524192bd0c0ea126c82453d0d0b01bd40068fa8fd05f2c703493e56ee62a719b458aa461b MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2 diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild new file mode 100644 index 000000000000..bf033e3cc6be --- /dev/null +++ b/x11-libs/libX11/libX11-1.7.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit toolchain-funcs xorg-3 + +# Note: please bump this with x11-misc/compose-tables +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="ipv6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] + ! - - olivier.laurantin@laposte.net - Olivier Laurantin - sparky@bluefang-logic.com Matthew Turnbull diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-1.8.9.ebuild deleted file mode 100644 index 6245bcf0201c..000000000000 --- a/x11-libs/xapps/xapps-1.8.9.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -VALA_USE_DEPEND="vapigen" -inherit gnome2-utils vala meson python-r1 xdg-utils - -DESCRIPTION="Cross-desktop libraries and common resources" -HOMEPAGE="https://github.com/linuxmint/xapp/" -LICENSE="GPL-3" - -SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/xapp-${PV}" -KEYWORDS="amd64 ~arm64 x86" - -SLOT="0" -IUSE="gtk-doc introspection static-libs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.37.3:2 - dev-libs/gobject-introspection:0= - gnome-base/libgnomekbd - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] - >=x11-libs/gtk+-3.3.16:3[introspection?] - x11-libs/libxkbfile - dev-libs/libdbusmenu[gtk3] -" -DEPEND="${RDEPEND} - sys-devel/gettext - gtk-doc? ( dev-util/gtk-doc ) - $(vala_depend) -" -BDEPEND=" - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-util/glib-utils - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.6 - sys-devel/gettext -" - -src_prepare() { - vala_src_prepare - default - - # Fix meson helpers - python_setup - python_fix_shebang meson-scripts schemas -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dpy-overrides-dir="/pygobject" - ) - meson_src_configure -} - -src_install() { - meson_src_install - rm -rf "${ED}/usr/bin" || die - - # package provides .pc files - find "${D}" -name '*.la' -delete || die - - # copy pygobject files to each active python target - # work-around for "py-overrides-dir" only supporting a single target - install_pygobject_override() { - PYTHON_GI_OVERRIDESDIR=$("${PYTHON}" -c 'import gi;print(gi._overridesdir)') || die - einfo "gobject overrides directory: $PYTHON_GI_OVERRIDESDIR" - mkdir -p "${ED}/$PYTHON_GI_OVERRIDESDIR/" - cp -r "${D}"/pygobject/* "${ED}/$PYTHON_GI_OVERRIDESDIR/" || die - python_optimize "${ED}/$PYTHON_GI_OVERRIDESDIR/" - } - python_foreach_impl install_pygobject_override - rm -rf "${D}/pygobject" || die -} - -pkg_postinst() { - xdg_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild index 3059ed0a95c1..bade1ef0d30b 100644 --- a/x11-libs/xapps/xapps-2.0.6.ebuild +++ b/x11-libs/xapps/xapps-2.0.6.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-3" SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/xapp-${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" SLOT="0" IUSE="gtk-doc introspection static-libs" @@ -74,9 +74,9 @@ src_install() { install_pygobject_override() { PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}" - mkdir -p "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die - cp -r "${D}"/pygobject/* "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die - python_optimize "${ED}/${PYTHON_GI_OVERRIDESDIR}/" + mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/" } python_foreach_impl install_pygobject_override rm -r "${D}/pygobject" || die diff --git a/x11-libs/xapps/xapps-2.2.1.ebuild b/x11-libs/xapps/xapps-2.2.1.ebuild new file mode 100644 index 000000000000..a7434062a552 --- /dev/null +++ b/x11-libs/xapps/xapps-2.2.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +VALA_USE_DEPEND="vapigen" + +inherit gnome2-utils vala meson python-r1 xdg-utils + +DESCRIPTION="Cross-desktop libraries and common resources" +HOMEPAGE="https://github.com/linuxmint/xapp/" +LICENSE="GPL-3" + +SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/xapp-${PV}" +KEYWORDS="~amd64 ~arm64 ~x86" + +SLOT="0" +IUSE="gtk-doc introspection static-libs" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/glib-2.44.0:2 + dev-libs/gobject-introspection:0= + dev-libs/libdbusmenu[gtk3] + gnome-base/libgnomekbd + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] + >=x11-libs/gtk+-3.16.0:3[introspection?] + x11-libs/libxkbfile +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} + $(vala_depend) + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/intltool-0.40.6 + sys-devel/gettext + + gtk-doc? ( dev-util/gtk-doc ) +" + +src_prepare() { + vala_src_prepare + default + + # don't install distro specific tools + sed -i "/subdir('scripts')/d" meson.build || die + + # Fix meson helpers + python_setup + python_fix_shebang meson-scripts +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + -Dpy-overrides-dir="/pygobject" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # copy pygobject files to each active python target + # work-around for "py-overrides-dir" only supporting a single target + install_pygobject_override() { + PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) + einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}" + mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die + python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/" + } + python_foreach_impl install_pygobject_override + rm -r "${D}/pygobject" || die +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} -- cgit v1.2.3