diff options
Diffstat (limited to 'x11-terms/terminator')
-rw-r--r-- | x11-terms/terminator/Manifest | 7 | ||||
-rw-r--r-- | x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch | 16 | ||||
-rw-r--r-- | x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch | 25 | ||||
-rw-r--r-- | x11-terms/terminator/files/terminator-1.92-metainfo.patch | 32 | ||||
-rw-r--r-- | x11-terms/terminator/metadata.xml | 10 | ||||
-rw-r--r-- | x11-terms/terminator/terminator-1.92.ebuild | 60 |
6 files changed, 146 insertions, 4 deletions
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest index a260d3ffae38..216a585e3676 100644 --- a/x11-terms/terminator/Manifest +++ b/x11-terms/terminator/Manifest @@ -1,5 +1,10 @@ AUX 0.90-without-icon-cache.patch 305 BLAKE2B 9160854ac4e681b91e3e780400ff6132257d27ddb7e29f9bc16733805c3cf1b8707dd4320bde8fd47636aa6e71161847cdcbb06759762674fcd81fa1717bf2d4 SHA512 fbe50c186f67610b084d3a02e7d398c2bca668c63107203af0b59f49fd0491efd4922824fd0a78263b433877d1736d187deb2ab9f29c243d913fc3908d3076ca AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381c6b66389e1ca8e82ebd961d970b84543133b098166008310fc035a591eb26e93c10fcc1bbb02ebc66752bb26145cbd SHA512 8944e27a6ab20f7f74c7dac9e2e93877a156ee5082c617dc7de84298bec303c7a0cf57fc1dd3cad4ae76ce2e15c50aacb8fe5587fe977727c10a6a3c48cca880 +AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50 +AUX terminator-1.92-make-tests-fail.patch 734 BLAKE2B c42414858614cda0480d69563ffc8ce2fef182eab5022a9b243203b1c663e191b7d66e7a09dbcf6d85bf7f302f3d25b8e182b7a3bd4af89697668fa6e0571e6a SHA512 594b5f9f4c9f7debe5cc8c343a0ba35429f1230595eefa1b343fbdd9b9c5931760658cd62736d0c2c6684182a4881e087ae9673ede6b63b86c9eba49ba849c40 +AUX terminator-1.92-metainfo.patch 1490 BLAKE2B 4d041053c3dd166a9ed2ea7cb53c64df6f3539dd94f00f560d30c7609b513e40abd5073b43a1f27d594661c21e1bb26699ea1dfefdcb99708774de9213a57c76 SHA512 de55463c02d6f7a63a17c12379ac145ed447d201bc2fdb066abe01763d50da92bfaf466ee945b8046eca3b69954282a9154a1455ae452c65cfebeda98e39481d DIST terminator-1.91.tar.gz 910536 BLAKE2B 887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9 SHA512 6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d +DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1 EBUILD terminator-1.91.ebuild 1331 BLAKE2B 2a078e0162e7461b313d5f2fd3e99e101378141c6f888b21dfc81a7173abea0dd127014c2e981383d15d3d752d034b879aea5a9a2dd2ae2e9b824aa469aef7c0 SHA512 5fe0c87d9ede370c12063f2c899c63f4a0d8cb19c675e113c7536fed496610fa82479b1b24e4c6d61edb149f655d16f3c432945447578ec27deca700dd949d18 -MISC metadata.xml 806 BLAKE2B 00acbe3d15886807ce00ca6485a6581a8c95b170e409c48e436eb618b23fe9dac541ab1ce0ace5639ec9fc4cc2a3a23801cf869b84fc7b7f260881983cee63fa SHA512 85da667a4abbc7442e8bc92697f316e19ccb281f49d1985a31cefcb1154462c4cddfc2a380c01de4c40cd3b1ab8516850d6257720e182b77bc4b721ad4ddc99b +EBUILD terminator-1.92.ebuild 1395 BLAKE2B 21053c113d0e410507491dade77bf46605e5d44f50341e35de277a140d59d039c10379978abdafdbd19921335f8d2171ed7bf6a0d70936d764ea9e3b384516de SHA512 6465a1cc9cdbe2b448fbd852f416b30f7d05cc96a5f4c2a3f7c14c60fa563a76000b0a1639e72098b5188156a4c65a3d41362555393194fb5e62c1c512872771 +MISC metadata.xml 944 BLAKE2B 3194719b108a2320e92ea5287f6c8f873bc68b50c151e344fe90ae4c717440de73411fe732c7314b32bcd584bf75ff7ffde4b4b712947f5bf2367ae79c01546b SHA512 8f8f58ffef9623ffbe30740020cd5dff027281f3c5ec0cdd8a57c138e79e331f76e791e1d3a938de5072c93bca19951ceec862ff6971bfe26c3218057c0787a8 diff --git a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch new file mode 100644 index 000000000000..c924de3607f5 --- /dev/null +++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch @@ -0,0 +1,16 @@ +Without this patch, terminator's build script runs gtk-update-icon-cache which +causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as +its own. To avoid that, gtk-update-icon-cache is run later, as part of +xdg_pkg_postinst in the ebuild. + +--- a/setup.py 2009-08-12 22:22:53.000000000 -0400 ++++ b/setup.py 2009-08-12 22:22:57.000000000 -0400 +@@ -25,7 +25,7 @@ + + def __init__ (self, *args): + self.without_gettext = False +- self.without_icon_cache = False ++ self.without_icon_cache = True + Distribution.__init__(self, *args) + + diff --git a/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch new file mode 100644 index 000000000000..ae722cb11685 --- /dev/null +++ b/x11-terms/terminator/files/terminator-1.92-make-tests-fail.patch @@ -0,0 +1,25 @@ +commit 9f855d41f3e6d610bd01df9688467fdbb341917c +Author: Alexey Sokolov <sokolov@google.com> +Date: Fri May 1 08:36:09 2020 +0100 + + Make failed tests fail the test + +diff --git a/run_tests b/run_tests +index 3bf51e4a..cc7fb56a 100755 +--- a/run_tests ++++ b/run_tests +@@ -4,10 +4,10 @@ for t in tests/test*; do + echo $t + file_type=$(file -b $t) + case ${file_type} in +- *[Pp]ython*) python ${t} ;; +- *Bourne*) bash ${t} ;; +- *bash*) bash ${t} ;; +- *perl*) perl ${t} ;; ++ *[Pp]ython*) python ${t} || exit 1 ;; ++ *Bourne*) bash ${t} || exit 1 ;; ++ *bash*) bash ${t} || exit 1 ;; ++ *perl*) perl ${t} || exit 1 ;; + *) echo "Unknown" ;; + esac + echo diff --git a/x11-terms/terminator/files/terminator-1.92-metainfo.patch b/x11-terms/terminator/files/terminator-1.92-metainfo.patch new file mode 100644 index 000000000000..ae2fed5d48f0 --- /dev/null +++ b/x11-terms/terminator/files/terminator-1.92-metainfo.patch @@ -0,0 +1,32 @@ +commit 39fb5fb9586e9974c2bf4772e18c86b07e3a4a41 +Author: Alexey Sokolov <sokolov@google.com> +Date: Fri May 1 20:38:00 2020 +0100 + + Install AppStream data as .metainfo.xml + + Following advice from https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html + +diff --git a/setup.py b/setup.py +index 7c54977e..38a819a9 100755 +--- a/setup.py ++++ b/setup.py +@@ -72,7 +72,7 @@ class BuildData(build): + [file_data.write(line.lstrip('_')) for line in file_in] + + appdata_in='data/terminator.appdata.xml.in' +- appdata_data='data/terminator.appdata.xml' ++ appdata_data='data/terminator.metainfo.xml' + rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR + + "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " + + appdata_in + " " + appdata_data) +@@ -205,9 +205,9 @@ setup(name=APP_NAME, + license='GNU GPL v2', + scripts=['terminator', 'remotinator'], + data_files=[ + ('bin', ['terminator.wrapper']), +- ('share/appdata', ['data/terminator.appdata.xml']), + ('share/applications', ['data/terminator.desktop']), ++ ('share/metainfo', ['data/terminator.metainfo.xml']), + (os.path.join(man_dir, 'man1'), ['doc/terminator.1']), + (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']), + ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']), diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml index 44b22d322ad3..d11068fa01fd 100644 --- a/x11-terms/terminator/metadata.xml +++ b/x11-terms/terminator/metadata.xml @@ -2,8 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> + <email>alexey+gentoo@asokolov.org</email> + <name>Alexey Sokolov</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription> Much of the behaviour of Terminator is based on GNOME Terminal, and @@ -16,6 +20,6 @@ <flag name="libnotify">Enables desktop notifications via<pkg>dev-python/notify-python</pkg></flag> </use> <upstream> - <remote-id type="launchpad">terminator</remote-id> + <remote-id type="github">gnome-terminator/terminator</remote-id> </upstream> </pkgmetadata> diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92.ebuild new file mode 100644 index 000000000000..5891577d909c --- /dev/null +++ b/x11-terms/terminator/terminator-1.92.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS="no" +inherit distutils-r1 virtualx xdg-utils + +DESCRIPTION="Multiple GNOME terminals in one window" +HOMEPAGE="https://github.com/gnome-terminator/terminator" +SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="dbus +libnotify" + +RDEPEND=" + >=dev-libs/glib-2.32:2 + dev-libs/keybinder:3[introspection] + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=x11-libs/gtk+-3.16:3 + x11-libs/vte:2.91[introspection] + dbus? ( sys-apps/dbus ) + libnotify? ( x11-libs/libnotify[introspection] ) +" +BDEPEND=" + dev-util/intltool +" +distutils_enable_tests setup.py + +PATCHES=( + "${FILESDIR}"/terminator-1.91-without-icon-cache.patch + "${FILESDIR}"/terminator-1.91-desktop.patch + "${FILESDIR}"/terminator-1.92-make-tests-fail.patch + "${FILESDIR}"/terminator-1.92-metainfo.patch +) + +src_prepare() { + xdg_environment_reset + distutils-r1_src_prepare +} + +src_test() { + virtx distutils-r1_src_test +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} |