diff options
Diffstat (limited to 'x11-terms')
21 files changed, 255 insertions, 342 deletions
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz Binary files differindex abafcbacec3d..ca26f42e8506 100644 --- a/x11-terms/Manifest.gz +++ b/x11-terms/Manifest.gz diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 81d8afe4d8ef..a4962e072b5a 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -1,7 +1,11 @@ +AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93 DIST gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz 33036 BLAKE2B 76c35db10664e02d1537aae586b47062b2ad85a48279426478ab2c9a9a659f728a7c01af2caaf058a71f4918d3d1e35a14c01dd7c67a2cf1aa368b4f4bc6eae7 SHA512 87d77fe8d9ab5b9ca3ff7eddcd462bf718b0f2d9dc1a60a2744ef8015b0910b588e0dc57ab10964602efa47465fd59f91381969157d9255fb5370039319a5f44 DIST gnome-terminal-3.28.2.tar.xz 2094920 BLAKE2B 02f6e9b7273247169966e3125931e452ee4ac4669c53c79c93f49073511ef25a3f21df60510df0e7aefffad5e3ea14acdd1338a1c7ce934439863728e2d709ec SHA512 a20fe13fd2e533a90236410ce6ddd11e4da9da13f2d8952baa3cbf07379dbe253cf897b596421852084bbfc000264de11fb605c73909af8188baa93e46ddae8f +DIST gnome-terminal-3.30.1-notify-open-title-transparency.patch.xz 32204 BLAKE2B d32cabea06df4290c592814a60443c3fb627ae7e837560bffdd0f803fd970b2962d7fc1d57a53f9bc62bd0ceb23ccade623e0d7099cb2610e599d9c2243c3ec2 SHA512 14e6e9baf1cd3fdd34ba320502de0ba99b0259598947562b5057472b099e85bcb6c60be8e5f58296c222deb85c35ddf5feefd1dbfac83710050e038f6e1b3a28 +DIST gnome-terminal-3.30.1.tar.xz 2099736 BLAKE2B a3100c7faf10f5d8ed3f16ae3ee28a7850e181dcf97ed52c0509143aa88114583466ddd3dfa1ea61372674cd6f16f9490c5ba9fafa4f5ce56eaeebe33ce259d5 SHA512 486fe7a9841114d49428208fdea195f1ce6a27ecfc66e2c77632385a7b106a28d3e6a0f1a198bd08f3e2a89d201ac49dafa376c002eab6470ff9d64cf30194ec DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96 EBUILD gnome-terminal-3.24.2.ebuild 2604 BLAKE2B 5ed19f08bd6f5f0e1cf906d1936cff022af37e2338106e72317354ce2e13e740b3e7e2253b6164517c215687e5af703c144f21800b773ff5f02fb980711b1c7c SHA512 8321fd29e858800cf7b7c71e9e0cdc6cc1bed07cc0841df63fc12a5492e7d3a36bd68221384145b8be9da0af92d1a0e559cac71ccd71130c1433b1209dc75f8e EBUILD gnome-terminal-3.28.2.ebuild 2487 BLAKE2B 84deec3d63b57776fa69e418c4a9eba30bfc135d6a3dc51e89e9d542d2c3c30a39092c00dffcf901508b2c0d5956498e5b06e062d192b9d8c8732bcde6d443ee SHA512 d9df4b14da08a36c15860cbbe6bcf4be54bb2dcf95abbd730710e01aebff0200058d9dc2d23112df0ec0eb01174732aa43dd5bb6e70aa4cbbe28b3bc6dcf5ccd +EBUILD gnome-terminal-3.30.1.ebuild 2699 BLAKE2B dfb6c17fd39d7152cb79cf179d203882e2fbb06dae8abb9935540b77e3736e37524589ad9910550dae454279d8913785dbb6858ac3925aa5d4c205f1bc82c643 SHA512 36f000d88db9ebc3747da6e8b8a7fbc0041e8f037ab1d768d752316c19e76a99785c103ff58ff3d98153f19df3a8f8dd905f627e90861127daeee5488c223d47 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688 diff --git a/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override new file mode 100644 index 000000000000..65d39a4966be --- /dev/null +++ b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.Terminal.Legacy.Settings] +unified-menu=false diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild new file mode 100644 index 000000000000..b824aba23f60 --- /dev/null +++ b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +GNOME2_LA_PUNT="yes" + +inherit gnome2 readme.gentoo-r1 + +DESCRIPTION="The Gnome Terminal" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="debug +gnome-shell +nautilus vanilla" +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-notify-open-title-transparency.patch.xz )" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960 +RDEPEND=" + >=dev-libs/glib-2.42:2 + >=x11-libs/gtk+-3.20:3 + >=x11-libs/vte-0.54.1:2.91[!vanilla?] + >=dev-libs/libpcre2-10 + >=gnome-base/dconf-0.14 + >=gnome-base/gsettings-desktop-schemas-0.1.0 + sys-apps/util-linux + gnome-shell? ( gnome-base/gnome-shell ) + nautilus? ( >=gnome-base/nautilus-3 ) +" +# itstool required for help/* with non-en LINGUAS, see bug #549358 +# xmllint required for glib-compile-resources, see bug #549304 +DEPEND="${RDEPEND} + dev-libs/libxml2:2 + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/intltool-0.50 + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig +" + +DOC_CONTENTS="To get previous working directory inherited in new opened tab, or + notifications of long-running commands finishing, you will need + to add the following line to your ~/.bashrc:\n + . /etc/profile.d/vte-2.91.sh" + +src_prepare() { + if ! use vanilla; then + # https://bugzilla.gnome.org/show_bug.cgi?id=695371 + # Fedora patches: + # Restore transparency support (with compositing WMs only) + # OSC 777 desktop notification support (notifications on tabs for long-running commands completing) + # Restore separate menuitems for opening tabs and windows + # Restore "Set title" support + # http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch + # Depends on vte[-vanilla] for OSC 777 patch in VTE + eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch + fi + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable debug) \ + $(use_enable gnome-shell search-provider) \ + $(use_with nautilus nautilus-extension) +} + +src_install() { + DOCS="AUTHORS ChangeLog HACKING NEWS" + gnome2_src_install + if ! use vanilla; then + # Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal" + insinto /usr/share/glib-2.0/schemas + newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override + fi + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + readme.gentoo_print_elog +} diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest index 667f448893f4..6f0a55273f71 100644 --- a/x11-terms/guake/Manifest +++ b/x11-terms/guake/Manifest @@ -1,11 +1,14 @@ AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275 +AUX guake-3.4.0-paths.patch 507 BLAKE2B b314a96a6a3f3795046a1d19dffc2037d8cfbba7028f83cfd30a913ada76b1d6073c9439857de1a4a5ee293ef7e9d7b8d0ad90eb01613ef61d099dc26ac32d23 SHA512 509ed5717eeb39330fa8f2fbb5653b8065e31ae2a5cbd36eb8b3ce768cff39f5ec42819cfff7ef7f12e114b242febb69af068d0be7f18b70ebce83eebdbda159 DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38 DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2 DIST guake-3.3.0.tar.gz 1006849 BLAKE2B 387ca17a881beebb84c81fda29a3f44ab3f297841010128bc4c5c4eded83d3325562bc88858fd1a8824a7c26d3bb9050bbe17399934f6e6cdcf8b4bf3c15d8a6 SHA512 1558e34f29060e449d676077c90df92ea9bc3a57857094be8d98cd283010de1125b7eeb3fbc3b3fcd08cacac9cf8ee461adb28cc29c491e8d2c3ad32fa39754b DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a50725103455cc5ccc5c4c7b67df6ce9eeac3c769ef3cb44bcc2e60305df80b6aa6af83c89a27b290e5ea48d19f8e SHA512 4d5585178d1e70d5b954071c4b68af22c459518df7af5930bd9a44f1f63afaff7b89bcab43422f9ae178c1dccf1268e5555d5776adb01fc8f11666dae2c3e766 +DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e31f753a9e30f1609eba34b1f09bb133bd5413436e375eda39bb2716c1ad8ef8e0baf6641b540f03efc95e9406 SHA512 94053383a28c60fefbed70f166669a9a1528e9505c3bbfc1688312ef896e1c25c006536c755f01dca4868a97b30d857b044715f59f7a345fa4dc6075fac72ab6 EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039 EBUILD guake-0.8.8.ebuild 1058 BLAKE2B 5dbb934d346f0278b921a6a25d28d1dee40460ca122d7e4594a78f1f6a4043afa576d6813f2231ef9747667141ca9c3deb182aef00bb7b30bf89d14ad6b2c0db SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135 EBUILD guake-3.3.0.ebuild 1355 BLAKE2B cc7e4a89920a56b095f22e7542acbba3aed0ae5ca4acb709ef278749f499f44f0448b0fccb7949c97726aa7a9e7c981c34878aac2259d38966501b9e3569f60a SHA512 cd4507485ee77ee61b7e51a75de238c6102d27b89e8871fb0c9f65fc86d6d2deb0f2a661cf2ada94cc0d05cb4d80124963bfaeedd29bb8c572a0ab02bb538280 EBUILD guake-3.3.2.ebuild 1375 BLAKE2B 7a6bdb335f6e183f794e50276be61f0f3910f4a626e4fd1e45e5e7443968bc6e9b29492f65f8b7a5032a9a59044a2b7cda3617a098b8b84d7aaa0769b6adbb6a SHA512 50846354bb23ca4799d506afdda2ae4aafd26029dff318862d230decd7ebc59e85e02526bdb88b771a4e3cc3bbca6b36c55ce8b91a0263a5ddfbc681bee99471 -EBUILD guake-9999.ebuild 1337 BLAKE2B ed4774014d089d3d1cab77ec1a942a753a0f29d4889614261896d695b97fb6dbd6da0de0e931f0ab4f0ff87fe3992f50f64234c2f6ac1fd3234b580710903700 SHA512 214191f9ba92e65b38d0b0813c274c80d2fb0ce834001f9141ab752f0b62470d9738fa21ac16c213728649e5945c7586fee5d3c65c63a9ae975c20ed2e50f5bf +EBUILD guake-3.4.0-r1.ebuild 1489 BLAKE2B 8305fd4a2f76f780686758d6958b8986923ed6400512b5e539e35888b804afa241e405874e618aade95db0f2575f1f11c15a17c93997e9bc97f809dcc7a089bd SHA512 428689bded27b8f67b4123c8c7d475eb4ece7531e86d7b80dcbaf6aff4912539a5782d27f00dc04f3046a0e01c425590f3391af861d9d6040b22666708ecfdfb +EBUILD guake-9999.ebuild 1451 BLAKE2B 88093ded4bca1b26b77d554a5b048733e6a19ca728fcf7c513fcd11f8180de68e139edcca2984adbc912fdfcaf9a3d89a04041688660638203442da5511bb204 SHA512 1dd05b62e534278e2e728ca8ff211b5c1dc68a3ad22a6c19d9ce84691d6243a6da7eebec09a2e6d0a3534f7b9c66e9ef2e16c446537958bbfd9c99153e63ee61 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87 diff --git a/x11-terms/guake/files/guake-3.4.0-paths.patch b/x11-terms/guake/files/guake-3.4.0-paths.patch new file mode 100644 index 000000000000..30a47294d5ec --- /dev/null +++ b/x11-terms/guake/files/guake-3.4.0-paths.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/667878 +https://github.com/Guake/guake/issues/1436 + +--- a/guake/paths.py ++++ b/guake/paths.py +@@ -35,7 +35,7 @@ + + + def get_data_files_dir(): +- d = os.path.dirname(os.path.dirname(sys.modules["guake"].__file__)) ++ d = os.path.dirname(sys.modules["guake"].__file__) + p = os.path.basename(os.path.abspath(os.path.join(d, ".."))) + if p in ["site-packages", "dist-packages"]: + # current "guake" package has been installed in a prefix structure (/usr, /usr/local or diff --git a/x11-terms/guake/guake-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild new file mode 100644 index 000000000000..a9aeb41ea1cf --- /dev/null +++ b/x11-terms/guake/guake-3.4.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{5,6} ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 gnome2-utils xdg-utils + +DESCRIPTION="Drop-down terminal for GNOME" +HOMEPAGE="https://github.com/Guake/guake https://pypi.org/project/Guake" +SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="utempter" + +RDEPEND=" + dev-libs/glib[${PYTHON_USEDEP}] + dev-libs/keybinder:3[introspection] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pbr[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + x11-libs/libnotify[introspection] + x11-libs/vte:2.91[introspection] + utempter? ( sys-libs/libutempter ) +" +DEPEND=" + ${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + gnome-base/gsettings-desktop-schemas + sys-devel/gettext + sys-devel/make +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.3.2-paths.patch + "${FILESDIR}"/${PN}-3.4.0-paths.patch +) +S=${WORKDIR}/${P^} + +python_compile_all() { + emake prepare-install prefix=/usr + emake generate-paths prefix=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)' + default +} + +python_install_all() { + emake install-schemas install-locale prefix=/usr DESTDIR="${D}" + distutils-r1_python_install_all +} + +pkg_postinst() { + gnome2_schemas_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update +} diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild index 46f3706e7f3d..593f8375adb6 100644 --- a/x11-terms/guake/guake-9999.ebuild +++ b/x11-terms/guake/guake-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,13 +17,14 @@ KEYWORDS="" IUSE="utempter" RDEPEND=" - dev-libs/keybinder:3 + dev-libs/glib[${PYTHON_USEDEP}] + dev-libs/keybinder:3[introspection] dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pbr[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/libnotify - x11-libs/vte:2.91 + x11-libs/libnotify[introspection] + x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) " DEPEND=" @@ -36,6 +37,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.3.2-paths.patch + "${FILESDIR}"/${PN}-3.4.0-paths.patch ) python_compile_all() { diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 868051c9bd1e..bcfd03039d5f 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,10 +1,8 @@ AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5 AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21 -DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3 SHA512 79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb -DIST kitty-0.11.2.tar.gz 3442111 BLAKE2B ebd5f11e57dd77a4336dfee51e2cf8c6c218d88957fe8988edcab9ecef73b7934b28e761733e9d8ca7842efb8a53fb30e785ed16fe73ac8c01b04a138d0e17a3 SHA512 28c4f7e8b87479cae47a00ea39ef31171ebeebf4888da4f9eaec250b4ed36ae6076b40e1a3b7ef88da2c9c860ba4d9af279a8b1d0d6e721f9fa3febee89bc151 DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df -EBUILD kitty-0.11.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88 -EBUILD kitty-0.11.2.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88 +DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db EBUILD kitty-0.12.1.ebuild 1897 BLAKE2B ce76a872f9c72f4079f3c5ba4e208defebc65b9a712f41ba43f071a4a2c885cf5adc8f2e9c6b29f526d439f9132ccd23be0d346d46d2dd9cff06561e5fa13692 SHA512 696cd41a9357d17a83d34bace843966e356e917c1162cb2a5f8b61fc0ac08ea4f4de55a2abd4d83932c02d1144636b21214ecb5875b301cee97985622c338fba -EBUILD kitty-9999.ebuild 1897 BLAKE2B ce76a872f9c72f4079f3c5ba4e208defebc65b9a712f41ba43f071a4a2c885cf5adc8f2e9c6b29f526d439f9132ccd23be0d346d46d2dd9cff06561e5fa13692 SHA512 696cd41a9357d17a83d34bace843966e356e917c1162cb2a5f8b61fc0ac08ea4f4de55a2abd4d83932c02d1144636b21214ecb5875b301cee97985622c338fba +EBUILD kitty-0.12.3.ebuild 2064 BLAKE2B ba783ecd219f7ed469b72709c6bde7a12cddd914b423483218c10d24ece856d6a0edc81c6428421398340b631ee7b60cf41a757c2b1378ecb41f551a3cbb22a8 SHA512 42c1f5ef221514ba863759514cd04a56ce469669b2e1cf6b217c810528a54681f2e664feaffaaabbf7d2a048c5460970529d48966e5c4ed2f01e7b4e89747139 +EBUILD kitty-9999.ebuild 2064 BLAKE2B ba783ecd219f7ed469b72709c6bde7a12cddd914b423483218c10d24ece856d6a0edc81c6428421398340b631ee7b60cf41a757c2b1378ecb41f551a3cbb22a8 SHA512 42c1f5ef221514ba863759514cd04a56ce469669b2e1cf6b217c810528a54681f2e664feaffaaabbf7d2a048c5460970529d48966e5c4ed2f01e7b4e89747139 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061 diff --git a/x11-terms/kitty/kitty-0.11.2.ebuild b/x11-terms/kitty/kitty-0.11.2.ebuild deleted file mode 100644 index 8bef706b26df..000000000000 --- a/x11-terms/kitty/kitty-0.11.2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit python-single-r1 toolchain-funcs gnome2-utils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug imagemagick wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPS=" - ${PYTHON_DEPS} - >=media-libs/harfbuzz-1.5.0:= - sys-libs/zlib - media-libs/libpng:0= - media-libs/freetype:2 - media-libs/fontconfig - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - ) -" -RDEPEND=" - ${COMMON_DEPS} - imagemagick? ( virtual/imagemagick-tools ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.0-flags.patch - "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py - - tc-export CC -} - -doecho() { - echo "$@" - "$@" || die -} - -src_compile() { - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - mkdir -p "${ED}"usr || die - cp -r linux-package/* "${ED}usr" || die - python_fix_shebang "${ED}" -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.11.1.ebuild b/x11-terms/kitty/kitty-0.12.3.ebuild index 8bef706b26df..b265ed95339e 100644 --- a/x11-terms/kitty/kitty-0.11.1.ebuild +++ b/x11-terms/kitty/kitty-0.12.3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) inherit python-single-r1 toolchain-funcs gnome2-utils @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" inherit git-r3 else - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty" LICENSE="GPL-3" SLOT="0" -IUSE="debug imagemagick wayland" +IUSE="debug doc imagemagick wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPS=" ${PYTHON_DEPS} >=media-libs/harfbuzz-1.5.0:= + sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 @@ -34,6 +35,7 @@ COMMON_DEPS=" x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] + x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 @@ -44,9 +46,10 @@ RDEPEND=" imagemagick? ( virtual/imagemagick-tools ) " DEPEND="${RDEPEND} + sys-libs/ncurses virtual/pkgconfig - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}] " +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}"/${PN}-0.11.0-flags.patch @@ -73,7 +76,10 @@ doecho() { } src_compile() { - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package + doecho "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package } src_test() { @@ -85,6 +91,10 @@ src_install() { mkdir -p "${ED}"usr || die cp -r linux-package/* "${ED}usr" || die python_fix_shebang "${ED}" + + if ! use doc; then + rm -r "${ED}"/usr/share/doc || die + fi } pkg_postinst() { diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index a97e7a7a8c5a..b265ed95339e 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" inherit git-r3 else - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi @@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty" LICENSE="GPL-3" SLOT="0" -IUSE="debug imagemagick wayland" +IUSE="debug doc imagemagick wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPS=" ${PYTHON_DEPS} >=media-libs/harfbuzz-1.5.0:= + sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 @@ -34,6 +35,7 @@ COMMON_DEPS=" x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] + x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 @@ -44,9 +46,10 @@ RDEPEND=" imagemagick? ( virtual/imagemagick-tools ) " DEPEND="${RDEPEND} + sys-libs/ncurses virtual/pkgconfig - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}] " +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}"/${PN}-0.11.0-flags.patch @@ -73,7 +76,10 @@ doecho() { } src_compile() { - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package + doecho "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package } src_test() { @@ -85,6 +91,10 @@ src_install() { mkdir -p "${ED}"usr || die cp -r linux-package/* "${ED}usr" || die python_fix_shebang "${ED}" + + if ! use doc; then + rm -r "${ED}"/usr/share/doc || die + fi } pkg_postinst() { diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest index 23fc22e7b038..63a7b5acf5d3 100644 --- a/x11-terms/mate-terminal/Manifest +++ b/x11-terms/mate-terminal/Manifest @@ -1,10 +1,3 @@ -DIST mate-terminal-1.12.1.tar.xz 1143628 BLAKE2B 241edfc9cf36518638e7817e4f11ab89dfcbbc1dd11d7e10ee17bc81ceb8224fd582a1cab4b4e2aa3a24f2997298689f7bc98f07b698243885cad1c85a81eea6 SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42 -DIST mate-terminal-1.14.1.tar.xz 1313612 BLAKE2B d8710d336964d7bc46e2e309de214bd5968697ae4b9ee750b30ff5af93480ba2bf74661698b14e4a81287c3689be4e45afb1031864183c9864773ea2097b2b2c SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209 -DIST mate-terminal-1.16.3.tar.xz 1279764 BLAKE2B 2908a9d003f1fd0e9faae3a69b55fe2a21c8ce7f54e91497964090f24f1abe553c0c4e9a28d31ac8351e9745acd496b843e1282c74fe37e41590d1b30faa5688 SHA512 b5045b57e6ad8931230edbd83cbad4e99422ccf8dbeb760327d091993012981c0ad6bfc7ae39aaeffdf8beb27a18d74c831b4e51bcef7709d7dc63bf77bcf7ad DIST mate-terminal-1.18.2.tar.xz 1302216 BLAKE2B 9b2e0171f62e75e967389aa3b06bcf908a9884055d220bca895ac01f8f21a4102f21a759f2b5e2f06bf2d8c18af3688f000ed9414525df203a79d2b6e66d7443 SHA512 ac35890dc955743ccf7d8176e710820179cc5dd8a89a8322eb99c29796c27586a6abb1503288896faf1eeba6047fad12cf506e67674ee6221313679061acf8c8 -EBUILD mate-terminal-1.12.1-r1.ebuild 826 BLAKE2B acb174bb84906768e94f111ebe6785b0138567ad82ece9a50489feb261e137c1fe55a8f9fb4ef23298f8582a0478446de0e88a51e453431eb08687cdfb3618b3 SHA512 68f12ae9b1a734a4c69347487a7974a9dabdb971f0286abdf87e6485119aec13b85db64f1c4d504733ab2a57115870fe06e08449740e1602d0c0478a67612623 -EBUILD mate-terminal-1.12.1.ebuild 821 BLAKE2B a479523ff16449f56372133ce46e8ac30f0da377810a801b2bce3c69db0f360bff4b980ad062cdc67c6b375d765e926e1b3d39e826b4b0b4ed013d318ba69872 SHA512 80f90a2640950924ba5c7133d11fbfa7f44ca1914d4c5b387b8712ea1dd62247051dca12cd978dd204cebd7400bdd223220a70f046ed651adefac2ad927e370a -EBUILD mate-terminal-1.14.1-r1.ebuild 866 BLAKE2B 7d1162a088fc9b90ed036b571adb0b64b2adcde79764ff399d3a3ff9ea32935a8f9f94350da622828eed599d07b8a15125ed8a49b2d6c92ea8bef8de181dfddd SHA512 aeb95bf228187367d4f84e874982b7a9fd2a7fdbd7cf55b4b3f29ae8e7765d14558d8d22ee25dc95d96e771aa73a0f82069ada2bc0c12ff33a0c8bf706bb14c0 -EBUILD mate-terminal-1.16.3.ebuild 727 BLAKE2B 322a0b3055192fa1a470ef3262cd5b3c0ed019c5665d11067f4981dea847dda196784dd31a7c3ac7dcad5a012fee9c8b0260def69d45d1dba7ec736987b8c895 SHA512 34ddf000b0c34e5ff8deeccd003457b390028b3ed7584cbc389257e00501a9267b78a950a2624da1320eb87fe1972afd213860787698a0aa4c48fc58cb55eb03 -EBUILD mate-terminal-1.18.2.ebuild 732 BLAKE2B e4a51cfa9050f1529e8c4f1973759933310cafc4e549aa5e1b813618f83a94cff3831004fdba2c876cd80a156f590eea6f4a04c8194014631e7045a591ac7d14 SHA512 4addb84d2e72e408030d8c39bbe5a716354cdefafecc4e271bbd75e29fbb84dd333ebdd73c319df63180c46c6d12270147894dd7c79b0171fd9196c33f0bc0d3 -MISC metadata.xml 418 BLAKE2B d1b548c3d32a7ace12f9b99517feb78a64263476a32bbb9dfb167f67039ae207e1cabed5201121f0576fbc1e507c8dbb7b6277598872710e4ffc1927d67e319b SHA512 fc7439e9cd6aee179e6e6bf2ad282c0a62dc78b53dc5a0b33798ac90006159ffcc00625c156cdf93a474ef592ee3be2134ac4c7778d5d8b2768fed1ae1464cee +EBUILD mate-terminal-1.18.2.ebuild 750 BLAKE2B 7b19c0857d4811baa6bd37d72a9f90724d066ebcc3c6b957fc48df48d99281f466d16a65306deb4f06ac695e94028d34178b66f58c73ad314ddaf0a94e943c3d SHA512 ec47a5c0b80e3384beeff37faf971e9b5f14ca9bdbb79f9388db87a3c2ce457655ec45f9c3b5dc29bce2d6abca8891590ff92f636f015025c1b7eebaa9272b89 +MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9 diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild deleted file mode 100644 index 9823dc8c3f04..000000000000 --- a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="The MATE Terminal" -LICENSE="GPL-3" -SLOT="0" - -IUSE="gtk3" - -RDEPEND="app-text/rarian:0 - dev-libs/atk:0 - >=dev-libs/glib-2.36:2 - >=mate-base/mate-desktop-1.6[gtk3(-)=] - x11-libs/gdk-pixbuf:2 - x11-libs/libICE:0 - x11-libs/libSM:0 - x11-libs/libX11:0 - x11-libs/pango:0 - !gtk3? ( - >=x11-libs/gtk+-2.24.0:2 - >=x11-libs/vte-0.28:0 - ) - gtk3? ( - >=x11-libs/gtk+-3.0:3[X] - >=x11-libs/vte-0.38:2.91 - )" - -DEPEND="${RDEPEND} - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools:0 - >=dev-util/intltool-0.50.1:* - sys-devel/gettext:* - virtual/pkgconfig:*" - -src_configure() { - mate_src_configure \ - --with-gtk=$(usex gtk3 3.0 2.0) -} diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild deleted file mode 100644 index 9eb68011adb6..000000000000 --- a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm x86" -fi - -DESCRIPTION="The MATE Terminal" -LICENSE="GPL-3" -SLOT="0" - -IUSE="gtk3" - -RDEPEND="app-text/rarian:0 - dev-libs/atk:0 - >=dev-libs/glib-2.36:2 - >=mate-base/mate-desktop-1.6[gtk3(-)=] - x11-libs/gdk-pixbuf:2 - x11-libs/libICE:0 - x11-libs/libSM:0 - x11-libs/libX11:0 - x11-libs/pango:0 - !gtk3? ( - >=x11-libs/gtk+-2.24.0:2 - >=x11-libs/vte-0.28:0 - ) - gtk3? ( - >=x11-libs/gtk+-3.0:3 - >=x11-libs/vte-0.38:2.91 - )" - -DEPEND="${RDEPEND} - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools:0 - >=dev-util/intltool-0.50.1:* - sys-devel/gettext:* - virtual/pkgconfig:*" - -src_configure() { - mate_src_configure \ - --with-gtk=$(usex gtk3 3.0 2.0) -} diff --git a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild deleted file mode 100644 index 8c3f9cc7b3bd..000000000000 --- a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="The MATE Terminal" -LICENSE="GPL-3" -SLOT="0" - -IUSE="gtk3" - -COMMON_DEPEND="dev-libs/atk:0 - >=dev-libs/glib-2.36:2 - >=mate-base/mate-desktop-1.6[gtk3(-)=] - x11-libs/gdk-pixbuf:2 - x11-libs/libICE:0 - x11-libs/libSM:0 - x11-libs/libX11:0 - x11-libs/pango:0 - !gtk3? ( - >=x11-libs/gtk+-2.24.0:2 - >=x11-libs/vte-0.28:0 - ) - gtk3? ( - >=x11-libs/gtk+-3.0:3[X] - >=x11-libs/vte-0.38:2.91 - )" - -RDEPEND="${COMMON_DEPEND}" - -DEPEND="${COMMON_DEPEND} - app-text/rarian:0 - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools:0 - >=dev-util/intltool-0.50.1:* - sys-devel/gettext:* - virtual/pkgconfig:*" - -src_configure() { - mate_src_configure \ - --with-gtk=$(usex gtk3 3.0 2.0) -} diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild deleted file mode 100644 index 33f211aa820c..000000000000 --- a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="The MATE Terminal" -LICENSE="GPL-3" -SLOT="0" - -IUSE="" - -COMMON_DEPEND="dev-libs/atk:0 - >=dev-libs/glib-2.36:2 - >=gnome-base/dconf-0.13.4:0 - x11-libs/gdk-pixbuf:2 - x11-libs/libICE:0 - x11-libs/libSM:0 - x11-libs/libX11:0 - x11-libs/pango:0 - >=x11-libs/gtk+-3.14:3[X] - >=x11-libs/vte-0.38:2.91" - -RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-desktop-1.6" - -DEPEND="${COMMON_DEPEND} - app-text/rarian:0 - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools:0 - >=dev-util/intltool-0.50.1:* - sys-devel/gettext:* - virtual/pkgconfig:*" diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild index 49f9068abe51..fbcc14a77757 100644 --- a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild +++ b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND} app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 + dev-util/glib-utils >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:*" diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml index 2f0acb5747d8..85e126f0649a 100644 --- a/x11-terms/mate-terminal/metadata.xml +++ b/x11-terms/mate-terminal/metadata.xml @@ -5,9 +5,6 @@ <email>mate@gentoo.org</email> <name>Gentoo MATE Desktop</name> </maintainer> - <use> - <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag> - </use> <upstream> <remote-id type="github">mate-desktop/mate-terminal</remote-id> </upstream> diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest index f8bf756dfb22..96411c8dd184 100644 --- a/x11-terms/xterm/Manifest +++ b/x11-terms/xterm/Manifest @@ -1,7 +1,7 @@ DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672 -DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347 DIST xterm-333.tgz 1298897 BLAKE2B 4b4c00639498201bd73d871f8274f52c62c0e852b17a25d241b9af09a137cb11639503b0d7eba8f2e6c1a79efe83a9c56a45bb6cab18ce1ee786402b2973fb3b SHA512 90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0 +DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05 -EBUILD xterm-331.ebuild 2612 BLAKE2B 8f1822ad662254d404c6b29984aa9d8c6e898249c728890507cbc561daafd1064f578051c6dd33509264b962d6369bb4ff57136f264252fa996cf28ad8a406a4 SHA512 c359b1f01968f0dacd9d4e566ac2e5c1e75b9e56c248b518f449d5c29e9b8365201bc28ad4c22d34822c2c218875c1b30cdbd27ec426d12a0834d00e1362708e EBUILD xterm-333.ebuild 2644 BLAKE2B 26ec3b74546d5c71a70e1de8264a146de15120334923f844e2c94083ba28796072cab342c3ecb1d9816d527ce7aa0188cf2633009a671c8cb806bcef125e053f SHA512 0d187ccdea85c6709a112287291b5d3f8d86b82b25689263c4127c5ead67861ebda03a71d139f8627a6931d253579695f81cd633a813b94c69bca3b94ab01bf2 +EBUILD xterm-337.ebuild 2654 BLAKE2B 00966164e3d921a1143494965c9a9de354d3002f0c4b538598f3bd4516d89c3dcaf21d4f0fb58d8be56f25d0e71c3824d1e42519676846a94274033c88754d80 SHA512 fba7b1e53e3959adce1f00f4f4f721369a9109964eb347623159f4f22c49ed38d05720193b4501880044496f4844029fe593204310f775fbe1929453bba43a5a MISC metadata.xml 403 BLAKE2B 7b0420abb55d7db9c383ae340cd74e518b4dd857fae33aa3a51bee1093261f0542a81f2b1c3250ff2b4701750201701e40fa4e24d9520961482c05bd181a7918 SHA512 a42b014499c03fb890ecd8e4f799ebd928d7a8d6db1ccd05236772faf8aca39a060fd590fbf4e5f7bb21dccf4b17cafa957d628c06db20650e6a87fd1ebef788 diff --git a/x11-terms/xterm/xterm-331.ebuild b/x11-terms/xterm/xterm-337.ebuild index 7df0e025fc6b..dd0e7348c83a 100644 --- a/x11-terms/xterm/xterm-331.ebuild +++ b/x11-terms/xterm/xterm-337.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils flag-o-matic multilib +inherit desktop flag-o-matic multilib DESCRIPTION="Terminal Emulator for X Windows" HOMEPAGE="https://invisible-island.net/xterm/" @@ -14,10 +14,14 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+openpty toolbar truetype unicode Xaw3d xinerama" -COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) +BDEPEND="virtual/pkgconfig + x11-base/xorg-proto" +DEPEND="kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) + media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage + x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft @@ -28,12 +32,9 @@ COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} media-fonts/font-misc-misc x11-apps/rgb" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - x11-base/xorg-proto" DOCS=( README{,.i18n} ctlseqs.txt ) @@ -48,38 +49,42 @@ src_configure() { # Everything gets linked against ncurses anyways, so don't shout append-libs $(pkg-config --libs ncurses) - econf \ - --libdir="${EPREFIX}"/etc \ - --disable-full-tgetent \ - --with-app-defaults="${DEFAULTS_DIR}" \ - --disable-setuid \ - --disable-setgid \ - --with-utempter \ - --with-x \ - $(use_with Xaw3d) \ - $(use_with xinerama) \ - --disable-imake \ - --enable-256-color \ - --enable-broken-osc \ - --enable-broken-st \ - --enable-exec-xterm \ - $(use_enable truetype freetype) \ - --enable-i18n \ - --enable-load-vt-fonts \ - --enable-logging \ - $(use_enable openpty) \ - $(use_enable toolbar) \ - $(use_enable unicode mini-luit) \ - $(use_enable unicode luit) \ - --enable-wide-chars \ - --enable-dabbrev \ + local myeconfargs=( + --disable-full-tgetent + --disable-imake + --disable-setgid + --disable-setuid + --enable-256-color + --enable-broken-osc + --enable-broken-st + --enable-dabbrev + --enable-exec-xterm + --enable-i18n + --enable-load-vt-fonts + --enable-logging + --enable-screen-dumps --enable-warnings + --enable-wide-chars + --libdir="${EPREFIX}"/etc + --with-app-defaults="${DEFAULTS_DIR}" + --with-utempter + --with-x + $(use_enable openpty) + $(use_enable toolbar) + $(use_enable truetype freetype) + $(use_enable unicode luit) + $(use_enable unicode mini-luit) + $(use_with Xaw3d) + $(use_with xinerama) + ) + econf "${myeconfargs[@]}" } src_install() { default - dohtml xterm.log.html + docinto html + dodoc xterm.log.html domenu *.desktop # Fix permissions -- it grabs them from live system, and they can |