diff options
Diffstat (limited to 'x11-misc')
28 files changed, 383 insertions, 142 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz Binary files differindex 3071cf8b74bc..7048b6b2d124 100644 --- a/x11-misc/Manifest.gz +++ b/x11-misc/Manifest.gz diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest index 17d256c955fb..9cdd6b507134 100644 --- a/x11-misc/compton/Manifest +++ b/x11-misc/compton/Manifest @@ -1,4 +1,4 @@ DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535 -EBUILD compton-0.1_beta2.ebuild 1616 BLAKE2B 0318edda3df5b9aafd34e683f3f6bccb23748d5512131d22bbbaa9a40bacaca31aa531489b71f7749903b2fcfaa618f1ecad9fa0f68ebdabab7052ab6836de0a SHA512 8bf2b00a9d1404a03e7f268325b938c0acc50e665cbb9380d935c8445cff14ded66ecf81e851a949efe75f9049a357e0790fadb4d2d12b4c1b5a85f932a298a0 +EBUILD compton-0.1_beta2.ebuild 1621 BLAKE2B 61720ff7bdb21efd8701b49410f67a3bf2c0386bce543f5c9e5e58431c7017f5e281eb7e26a41b5dd1895d9e45731418bd6e43da9f246f582964f8f23ad6f792 SHA512 6acf0d8276c5ee7660d8133f376e4d5281f66c4118ae40d126f1f33d9340c5ee5e19d3a65ec98b637b970a54a29cc31aa4d34be04ed672f0c5de685902edf7bd EBUILD compton-9999.ebuild 1537 BLAKE2B 2e7c807a0ddfe672a3946394ed3bc16288ec72a050a2f0f0c30829d2283737e39ebb3bbdcf047c71ef478d23e7f2566372ff17f07fc41822f3ce5ee25156a678 SHA512 8b8aa77c5357b2d2c6627223d3a942388c22245646c035fff599b33e1b6df6494dfd1ee4d9cd0d9ecd5c1681510f30602f028e436104cd752762bb02b23c43c2 MISC metadata.xml 484 BLAKE2B 903744ba49b9aaae86cec59c83f96f02da325d17813d6ceaedd88eab1450ae76eac7a40c9e1b44086651efd21e5580b605b9095925625fa3bb1e6c708ed8809f SHA512 d01d17901f47f7e2c0201c0a6665d0e27693ac42b27ef8dce8a78763ec775a41fed88b4565db434351a2c9d01e762121bca3f347f467e77e71bde66f019640cb diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild index c0e2472a6353..7d94d23b5320 100644 --- a/x11-misc/compton/compton-0.1_beta2.ebuild +++ b/x11-misc/compton/compton-0.1_beta2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc x86" IUSE="dbus +drm opengl +pcre xinerama" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest index db0f598bb36f..cfd9bc2d3115 100644 --- a/x11-misc/mugshot/Manifest +++ b/x11-misc/mugshot/Manifest @@ -1,6 +1,5 @@ -AUX fix_env_spawn_args.patch 1542 BLAKE2B d106f8c488b5a5a7343ce822d8e6dacb1e2a0c9c09b56548e7eb0dc40e6e7d9d6c2192abd80a748e724194001b8e2b6e78465e5652e70306293e4c33f85fb4e1 SHA512 83018570ac1663abc5f7210075bfaf9d9220bf32d516e34b0146adb589964f0bdcbbc9fb4d8cd8f9f535bf766a87d47682bb8e3196edd4a7039793c811fc6677 -AUX missing_default_face.patch 785 BLAKE2B 43646f826480e6def661ff7dff3aa84d8b2b789ce977a9f321b8f66dce4e0a3a4c822e91d341101ce12a6df9384268156d14badf5b57bc5cb638d661a27c6749 SHA512 e855d9491a2d45322041de653cc3d852d79b80e27ea0c7064f65d61d9c69a001602f63043ad847ce399f80e2afce662874aeeaa09b47fe41e2af8cb797fbcd31 -AUX use_office_phone.patch 712 BLAKE2B d94a87060e67be5b82ee97266fb0300d14b42932657db332a8d73b5cbd6ac82df989b6a24ed2d774f3e7eaf64efe80934e12aff6bd8577a654e510e0c26f6735 SHA512 7d8ebd02d5472d08b73360744b13dab238dbc15d8a5daa31c5458c09ee7d74210be9be2f36446f6c71d3765a041c72f2b449cffcf6655944d2246559f45909a3 -DIST mugshot-0.4.0.tar.gz 126101 BLAKE2B be0d84fd09a1ff6477d32a77d979b1606597b2ca38524b9cc65c254dd9d5d43697123b10d2b836c1193a9ba0f3dadebb15d1fe89ab7fb1743cc7b4d177ace65d SHA512 5936ec3def5a70db21f9bcc7fce873ce374f8df0795fb944593f398704dcba8c81be30393603e1753e176da87f4a6fd8a3218de2aeb7f33ea6018735ce1b2c09 -EBUILD mugshot-0.4.0.ebuild 1499 BLAKE2B fc7340c94b69abc32bb530b55bfbd8e947445cb8182e407484df3ec24e0053e45339b7e3b0b10e7b3820f39a6ac74ff81b2fcc02f917f9f68b4aaaf5e37568ed SHA512 0dd112ce2a18517b9c9ed374e74367abfce0e0a509f937c52055fc5510f39095fa4f5bc022775332bf1a5c963fde2ed0e0dd68cc354adc5402d40384ad0472d1 -MISC metadata.xml 1139 BLAKE2B 761c09b3f9f3f81667a253876b89dafc107f503cbc9ca20242e3974c011077bdbabe0206d59cf4504328c49ef4f87c0716330e78ff1f0b953b9bb380c5820d06 SHA512 7ac0a6925a7b55f59410444537ee944c5491204f7257eaa215b599dbc31e1a183c124815a3761295058aa5a61dafae2b4bd9bf4659e76cc3deca5690e7f70cb1 +AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13430ebca92b95a0632fed667c49b5885cc393ee0bb6743453e9e5fa621959113c43b87590842e56d735f8666533bb22a6522606027 SHA512 5abb02cd511482c3f32e56a7f121bf6cce102dab7dfee196a105ff5ed2cbf3d9ee3f20f0d75eecfe192d0c16603dd80555fcdc872cc85bffa74de7d0bbab79b1 +AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c +DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe +EBUILD mugshot-0.4.1.ebuild 1390 BLAKE2B c20c882dce7770975b3617698ad76d9c5ca4e8ee5b32650a4bda9b52c67ad8474b01bc7cdc88f3d6b10961f207328c37fb97ea4c5ec4430185698490f1c10ef0 SHA512 97c1fe8f870d3d1700f13e90b05e43a5c49e985118383c8cb1c0a2a30c55e1ab8775fef24d0469b173507d684901ec361aebab39570489c845de4a8d5ed0ac04 +MISC metadata.xml 1046 BLAKE2B a0aed33d0d8110e8fc4038e3831d39f4696dfc712d4fe0c7e963c9f5861b2bbf7f087d6d74e519f1fbd8cc1212110c7298617bf5e9481dffbb7da820580440d3 SHA512 3c2cad8d7defa4719ba1497605dab8a3ef271decceddb690f2e5c5a24d4caad53dca82e347f65eda7cf70af29f558105b7daa4d0ed55891d2ff1a38565ec923a diff --git a/x11-misc/mugshot/files/fix_env_spawn_args.patch b/x11-misc/mugshot/files/fix_env_spawn_args.patch deleted file mode 100644 index bb24418a7dbc..000000000000 --- a/x11-misc/mugshot/files/fix_env_spawn_args.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/mugshot_lib/SudoDialog.py 2018-04-12 00:23:21.000000000 +0200 -+++ b/mugshot_lib/SudoDialog.py 2018-06-22 22:21:10.876589365 +0200 -@@ -48,7 +48,7 @@ - return False - - # Check for LANG requirements -- child = env_spawn('sudo -v', 1) -+ child = env_spawn('sudo', ['-v'], 1) - if child.expect([".*ssword.*", "Sorry", - pexpect.EOF, - pexpect.TIMEOUT]) == 3: -@@ -57,7 +57,7 @@ - child.close() - - # Check for sudo rights -- child = env_spawn('sudo -v', 1) -+ child = env_spawn('sudo', ['-v'], 1) - try: - index = child.expect([".*ssword.*", "Sorry", - pexpect.EOF, pexpect.TIMEOUT]) -@@ -76,14 +76,14 @@ - return False - - --def env_spawn(command, timeout): -+def env_spawn(command, args, timeout): - """Use pexpect.spawn, adapt for timeout and env requirements.""" - env = os.environ - env["LANG"] = "C" - if use_env: -- child = pexpect.spawn(command, env) -+ child = pexpect.spawn(command, args, env) - else: -- child = pexpect.spawn(command) -+ child = pexpect.spawn(command, args) - child.timeout = timeout - return child - -@@ -304,7 +304,7 @@ - Return True if successful. - ''' - # Set the pexpect variables and spawn the process. -- child = env_spawn('sudo /bin/true', 1) -+ child = env_spawn('sudo', ['/bin/true'], 1) - try: - # Check for password prompt or program exit. - child.expect([".*ssword.*", pexpect.EOF]) diff --git a/x11-misc/mugshot/files/missing_default_face.patch b/x11-misc/mugshot/files/missing_default_face.patch deleted file mode 100644 index 0d25fb610137..000000000000 --- a/x11-misc/mugshot/files/missing_default_face.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/mugshot/MugshotWindow.py 2018-04-12 00:23:21.000000000 +0200 -+++ b/mugshot/MugshotWindow.py 2018-06-22 22:27:05.515588012 +0200 -@@ -257,10 +257,11 @@ - logger.debug('Found profile image: %s' % str(image)) - - if os.path.isfile(face): -- if os.path.samefile(image, face): -- self.updated_image = face -- else: -- self.updated_image = None -+ if os.path.exists(image): -+ if os.path.samefile(image, face): -+ self.updated_image = face -+ else: -+ self.updated_image = None - self.set_user_image(face) - elif os.path.isfile(image): - self.updated_image = image diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch new file mode 100644 index 000000000000..cc504d667af9 --- /dev/null +++ b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch @@ -0,0 +1,18 @@ +--- a/mugshot/MugshotWindow.py 2018-08-08 11:22:42.000000000 +0200 ++++ b/mugshot/MugshotWindow.py 2018-08-15 22:48:39.998699923 +0200 +@@ -256,10 +256,11 @@ + + if os.path.isfile(face): + try: +- if os.path.samefile(image, face): +- self.updated_image = face +- else: +- self.updated_image = None ++ if os.path.exists(image): ++ if os.path.samefile(image, face): ++ self.updated_image = face ++ else: ++ self.updated_image = None + except FileNotFoundError: + self.updated_image = None + self.set_user_image(face) diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch new file mode 100644 index 000000000000..07c2003f50d8 --- /dev/null +++ b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch @@ -0,0 +1,23 @@ +--- a/mugshot/MugshotWindow.py 2018-08-08 11:22:42.000000000 +0200 ++++ b/mugshot/MugshotWindow.py 2018-08-15 22:47:02.108700297 +0200 +@@ -617,14 +617,18 @@ + # chfn 2.29 uses "-p" as parameter for changing the office-phone (LP: #1699285) + p_command = "%s -p \"%s\" %s" % (chfn, office_phone, username) + +- # other (newer, older?) use "-w" ++ # other (newer, older?) use "-o" or "-w" ++ o_command = "%s -o \"%s\" %s" % (chfn, office_phone, username) + w_command = "%s -w \"%s\" %s" % (chfn, office_phone, username) + + if self.process_terminal_password(p_command, password) or \ + self.process_terminal_password(w_command, password): + self.office_phone = office_phone + else: +- success = False ++ if self.process_terminal_password(command2, password): ++ self.office_phone = office_phone ++ else: ++ success = False + + return (success, response) + diff --git a/x11-misc/mugshot/files/use_office_phone.patch b/x11-misc/mugshot/files/use_office_phone.patch deleted file mode 100644 index bea3f7ce4dae..000000000000 --- a/x11-misc/mugshot/files/use_office_phone.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/mugshot/MugshotWindow.py 2018-06-22 22:33:03.980586645 +0200 -+++ b/mugshot/MugshotWindow.py 2018-06-22 22:41:44.120584661 +0200 -@@ -614,10 +614,14 @@ - - logger.debug('Updating Office Phone...') - command = "%s -w \"%s\" %s" % (chfn, office_phone, username) -+ command2 = "%s -o \"%s\" %s" % (chfn, office_phone, username) - if self.process_terminal_password(command, password): - self.office_phone = office_phone - else: -- success = False -+ if self.process_terminal_password(command2, password): -+ self.office_phone = office_phone -+ else: -+ success = False - - return (success, response) - diff --git a/x11-misc/mugshot/metadata.xml b/x11-misc/mugshot/metadata.xml index 9e143660d318..70aef0f5e797 100644 --- a/x11-misc/mugshot/metadata.xml +++ b/x11-misc/mugshot/metadata.xml @@ -17,7 +17,6 @@ <use> <flag name="gnome">Add support for <pkg>gnome-base/gnome-control-center</pkg></flag> <flag name="libreoffice">Add support for <pkg>app-office/libreoffice</pkg> and <pkg>app-office/libreoffice-bin</pkg></flag> - <flag name="pidgin">Add support for setting the avatar in <pkg>net-im/pidgin</pkg> </flag> <flag name="webcam">Add support for setting a profile photo in <pkg>media-video/cheese</pkg></flag> </use> <upstream> diff --git a/x11-misc/mugshot/mugshot-0.4.0.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild index 23ceab58d94c..d8635da5b1e2 100644 --- a/x11-misc/mugshot/mugshot-0.4.0.ebuild +++ b/x11-misc/mugshot/mugshot-0.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{4,5,6} ) inherit distutils-r1 eapi7-ver gnome2-utils @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gnome libreoffice pidgin webcam" +IUSE="gnome libreoffice webcam" RDEPEND="dev-libs/gobject-introspection dev-python/dbus-python[${PYTHON_USEDEP}] @@ -25,7 +25,6 @@ RDEPEND="dev-libs/gobject-introspection x11-libs/gtk+:3 gnome? ( gnome-base/gnome-control-center ) libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) ) - pidgin? ( net-im/pidgin[${PYTHON_USEDEP}] ) webcam? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 gnome? ( media-libs/clutter-gtk[introspection] @@ -36,11 +35,10 @@ DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}] ${RDEPEND}" PATCHES=( - # https://bugs.launchpad.net/ubuntu/+source/mugshot/+bug/1443283 - "${FILESDIR}/fix_env_spawn_args.patch" # Both patches are taken from Arch Linux - "${FILESDIR}/missing_default_face.patch" - "${FILESDIR}/use_office_phone.patch" + # and adapted to newest version + "${FILESDIR}"/${P}-missing_default_face.patch + "${FILESDIR}"/${P}-use_office_phone.patch ) pkg_postinst() { diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest index 44eae4529091..1df4f4deab97 100644 --- a/x11-misc/qterm/Manifest +++ b/x11-misc/qterm/Manifest @@ -1,3 +1,7 @@ +AUX qterm-0.7.1-headers.patch 699 BLAKE2B 277e0c28c6ab55e522b76c8595df16c43cc2653e40023ce9845540e4c7e60bce591a6ae07a7a77985a05c9563cf0fda5ad7e01c8eb00c6443788f3b49ae3c77a SHA512 e6d07ebf7ae8913214cd893f00dbcb7871f17bdea4336db56e18958781804255837c176d4c6febe960ceb1f3741da797c8fd2934246961915934d86675967a0e +AUX qterm-libressl.patch 1838 BLAKE2B 806757d7a8d63cbdffd2b6eb99bcb9333cdbcbe8e74ea5f5d73d53e1fca0fdc6c8aa25337f144aca0398606e771024fd52d96eb320a7d0f8f85c114850a29557 SHA512 927c2753d205c1d047f2c289ea170da65d9db1eb5713334a947e1aebe0a3c67e630d06a2607b0656e286e27813dca781e0e6f8215dfa483fc804b4dfdb19c171 DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd -EBUILD qterm-0.7.1.ebuild 1217 BLAKE2B 13349e94221931887261b341881bde0f7cd07a109224d12c4e5ec8242473a262a7c4f16c3838b92e13cd8a2601b4030f4d0ad956e9cd82e3c813332389f06c5c SHA512 724404d1803f734d5bfa6ccdf4ce825751a89d3b363dcd2eaafc4089942bc7d9fa389b41513e3594caaf6aa08cc57787f84e95a3765b3a3e7b2f77679bfcbc53 -MISC metadata.xml 360 BLAKE2B cba279bdcffd2c960f7dded51892476b2f087b5ff54eb1f39b2e1251e1e2accf41b42185efa57b03a357a6d2ac5ae84673f77ad78504290741b9000f58d129e9 SHA512 ccdcf09d604e38d3059829a1cab9415900bc39ef126bb5d5825781713512eff75e99046a8133ad74bfe2407fae51ab4013ea5600efa0a65a70666ef98a1013ac +DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046 +EBUILD qterm-0.7.1.ebuild 1255 BLAKE2B fedc1e24a115cac7d30f74520d28de368dfbf243d855789dda433f772d9992f8e2b96e371a8fbf4844d59ab46c837d5e1aa6848199962126bc16bbbe471cac8e SHA512 7b34ad4108b4091f329fa47e1f0c9da56fb43e2515d4669e472370c8556279bf35af0ce01815099ca486ef9e716e1d096728e03a0a2554ab416f0c25c207278f +EBUILD qterm-0.7.3.ebuild 1237 BLAKE2B d696f608cfe373a1aa9902a3651fe7917a1708f185a6023484f53eec09c1b42a63e8332f46e48c7e2d2d73df7580839e7e82910ccb2fb887b960a792e47a083e SHA512 72fa5023b531217f53aa7dc0e3f11b9256f86402358c45037c1fa7a9ec363da90d9d84a6d6d23249f46a1b52375b713afe17288404baf94c6a7946282af97266 +MISC metadata.xml 360 BLAKE2B 8d292a4705a58ce03c68c3b7933414a5a1e5399258b8d6e4346098c948261d8dbfc2ebe5012c0e2c5a445cd93e4061c0322152d71ba73d8b6ebfc00a6b1935aa SHA512 e93913eefab59f5e1fb1478b5ac530c689b92bc27230d44dd98e233d75c2b8cd8a9e3f3f123dca0f6dbef1ceacb1fbdcfd13c34a0f8f96b09d348ce323334f62 diff --git a/x11-misc/qterm/files/qterm-0.7.1-headers.patch b/x11-misc/qterm/files/qterm-0.7.1-headers.patch new file mode 100644 index 000000000000..c442c0ac8b30 --- /dev/null +++ b/x11-misc/qterm/files/qterm-0.7.1-headers.patch @@ -0,0 +1,40 @@ +--- a/src/keydialog.h ++++ b/src/keydialog.h +@@ -10,6 +10,7 @@ + #ifndef KEYDIALOG_H + #define KEYDIALOG_H + ++#include <QButtonGroup> + #include "ui_keydialog.h" + namespace QTerm + { +--- a/src/soundconf.h ++++ b/src/soundconf.h +@@ -1,6 +1,7 @@ + #ifndef SOUNDCONF_H + #define SOUNDCONF_H + ++#include <QButtonGroup> + #include "ui_soundconf.h" + namespace QTerm + { +--- a/src/shortcutsdialog.cpp ++++ b/src/shortcutsdialog.cpp +@@ -3,6 +3,7 @@ + #include <QKeyEvent> + #include <QMessageBox> + #include <QShortcut> ++#include <QAction> + + namespace QTerm { + +--- a/src/shortcutsdialog.h ++++ b/src/shortcutsdialog.h +@@ -3,6 +3,7 @@ + + #include "ui_shortcutsdialog.h" + class QShortcut; ++class QAction; + + namespace QTerm{ + diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch new file mode 100644 index 000000000000..d0e0ae1f9cb5 --- /dev/null +++ b/x11-misc/qterm/files/qterm-libressl.patch @@ -0,0 +1,60 @@ +--- a/src/ssh/libcrypto-compat.c ++++ b/src/ssh/libcrypto-compat.c +@@ -8,7 +8,7 @@ + */ + + #include "libcrypto-compat.h" +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include <string.h> + #include <openssl/engine.h> + +--- a/src/ssh/libcrypto-compat.h ++++ b/src/ssh/libcrypto-compat.h +@@ -9,7 +9,7 @@ + #include <openssl/evp.h> + #include <openssl/hmac.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); + int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); +--- a/src/ssh/socket.cpp ++++ b/src/ssh/socket.cpp +@@ -36,7 +36,7 @@ + SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent) + : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_ciphers(); + #endif + m_sessionID = NULL; +@@ -56,7 +56,7 @@ + + SSH2SocketPriv::~SSH2SocketPriv() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + #endif + } +@@ -133,7 +133,7 @@ + #ifdef SSH_DEBUG + qDebug() << "init ssh1 session"; + #endif +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_ciphers(); + #endif + m_inPacket = new SSH1InBuffer(plainSocket, this); +@@ -148,7 +148,7 @@ + + SSH1SocketPriv::~SSH1SocketPriv() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + #endif + } diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml index d9de788cca8b..59fe2d65e616 100644 --- a/x11-misc/qterm/metadata.xml +++ b/x11-misc/qterm/metadata.xml @@ -6,7 +6,7 @@ <name>Cjk</name> </maintainer> <upstream> - <remote-id type="sourceforge">qterm</remote-id> <remote-id type="github">qterm/qterm</remote-id> + <remote-id type="sourceforge">qterm</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild index 9196ecbc57cb..d1116333ae8f 100644 --- a/x11-misc/qterm/qterm-0.7.1.ebuild +++ b/x11-misc/qterm/qterm-0.7.1.ebuild @@ -1,21 +1,20 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="6" inherit cmake-utils gnome2-utils xdg-utils -DESCRIPTION="A BBS client for Linux" +DESCRIPTION="A BBS client based on Qt" HOMEPAGE="https://github.com/qterm/qterm" -SRC_URI="https://github.com/qterm/qterm/archive/0.7.1.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" IUSE="libressl" -RDEPEND=" - dev-qt/qtcore:5 +RDEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 @@ -25,41 +24,34 @@ RDEPEND=" dev-qt/qtxml:5 x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) -" + libressl? ( dev-libs/libressl:= )" DEPEND="${RDEPEND} dev-qt/linguist-tools:5 dev-qt/qthelp:5 - x11-base/xorg-proto -" + x11-base/xorg-proto" +PATCHES=( + "${FILESDIR}"/${PN}-libressl.patch + "${FILESDIR}"/${P}-headers.patch +) DOCS=( README.rst RELEASE_NOTES TODO ) src_prepare() { - cmake-utils_src_prepare + # file collision with sys-cluster/torque, bug #176533 + sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt + sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop - sed -i -e "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop || die + cmake-utils_src_prepare + xdg_environment_reset } src_configure() { - xdg_environment_reset - local mycmakeargs=( -DQT5=ON ) - cmake-utils_src_configure } -src_install() { - cmake-utils_src_install - mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { gnome2_icon_cache_update } diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3.ebuild new file mode 100644 index 000000000000..8297a404681e --- /dev/null +++ b/x11-misc/qterm/qterm-0.7.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="A BBS client based on Qt" +HOMEPAGE="https://github.com/qterm/qterm" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5[scripttools] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + x11-libs/libX11 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= )" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qthelp:5 + x11-base/xorg-proto" + +PATCHES=( "${FILESDIR}"/${PN}-libressl.patch ) +DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt ) + +src_prepare() { + # file collision with sys-cluster/torque, bug #176533 + sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt + sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop + + cmake-utils_src_prepare + xdg_environment_reset +} + +src_configure() { + local mycmakeargs=( + -DQT5=ON + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest index f1e7f63b3a30..c429da60c487 100644 --- a/x11-misc/spnavcfg/Manifest +++ b/x11-misc/spnavcfg/Manifest @@ -1,4 +1,4 @@ AUX spnavcfg-0.3-custom-flags.patch 1568 BLAKE2B b4280b99137f36d9c3a191f25ea9a55785878a004fdf6d581ade55161e1cbd15bd5895ad8d61844a3a19f56e3ba6d226ad49ae6f31550317be0a5894e9e5c6bf SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632 DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 EBUILD spnavcfg-0.3.ebuild 625 BLAKE2B 6b2af2cb0be40861e6f944463fd63d74cf0e3d42e6c5c4bc969a1542440e960b5d73a2ca103ff9ec24e865fb05c9c3480ca63201d689ed063861463785966248 SHA512 6d4ec044c9b9d9318b4645e759436e7577179c0fba5934cda57850c6dca2da24bca939583aee098b746aafc5cfc2697f3f2cbb17ecda2f53628c165b395b11a2 -MISC metadata.xml 693 BLAKE2B a00013874c5abb67440dc1eb1c08ee8d1e27ad4be000151a06160f187ee8cf716afd36cfec969f6d89206d8dd31f59af79365375e12a3aa998bd338b6955fc08 SHA512 fe3071295032bceaf2df17c955b234063246f37a59a25b5e630c21f1443d16d3bf4fe7979fdf4d01df88ff7194bd6258fae78b5e4ba582f396ff3d8007ccf7f5 +MISC metadata.xml 453 BLAKE2B 4c8ef802efbd4de680f3ad9c9cdaa03456fb455e935f5a7ac7420ed0b9daf2bc85cd2b0ee0341730f61f6d17347fc044d55cc5cd02014a7acc91d199d60cde2a SHA512 842fe244bf67c8faf15dba7bd13903c5051ca26d1627eb8c0dd9d1096973249f8f86163454fcdea38071c4fc9d9c43faf3076c1c4aea66e1b555725a4e251c66 diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml index d8bdf8ef87b4..6367108ce053 100644 --- a/x11-misc/spnavcfg/metadata.xml +++ b/x11-misc/spnavcfg/metadata.xml @@ -2,17 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>anthoine.bourgeois@gmail.com</email> - <name>Anthoine Bourgeois</name> - </maintainer> - <maintainer type="person"> <email>sping@gentoo.org</email> <name>Sebastian Pipping</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription> The spnavcfg is the GTK-based configuration GUI for <pkg>app-misc/spacenavd</pkg>. diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest index 1db031237345..3afbbd752c02 100644 --- a/x11-misc/tint2/Manifest +++ b/x11-misc/tint2/Manifest @@ -12,6 +12,6 @@ EBUILD tint2-0.12.12.ebuild 1400 BLAKE2B 9f386182995036c6f99f279c461f26486d3ec05 EBUILD tint2-0.14.6-r2.ebuild 1341 BLAKE2B 8a26bdde86b7c5c0b44e05c184c7f6f2994c1ba52884025032aa71058a6ea3a3f0a35ba0abe69429ba608dc389c28ba609d868bea58a6b4a6ad08981fedb1637 SHA512 a76155df865a0b6dd2c12709f42e2848b9330e51a0c55392c42caa76f017550a94343469b741cfbee375f527b711a8a158efdccf315f3917442f13fec91d19f7 EBUILD tint2-15.3.ebuild 1273 BLAKE2B f481e61000569a5491f3d02a03fbf74d2e824ece425c38c6ebe2a9d342c53881ac6a53c02c962e783dd609d8cfa4d9ebbd34374f5e2226980c17fa92462a89c9 SHA512 661effd4bf12390e7fdcd08e363ae7d8dc8aa9d4388c65b7f0360d6f9529ac60223edfe0f993cf99edeffe7f002f8e0eab436c58261be7f77f9e933e17667c8e EBUILD tint2-16.1.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899 -EBUILD tint2-16.2.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899 -EBUILD tint2-16.6.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899 +EBUILD tint2-16.2.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419 +EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf diff --git a/x11-misc/tint2/tint2-16.2.ebuild b/x11-misc/tint2/tint2-16.2.ebuild index f7cbd25ca6f4..e901507e5acb 100644 --- a/x11-misc/tint2/tint2-16.2.ebuild +++ b/x11-misc/tint2/tint2-16.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="battery svg startup-notification tint2conf" DEPEND=" diff --git a/x11-misc/tint2/tint2-16.6.ebuild b/x11-misc/tint2/tint2-16.6.ebuild index f7cbd25ca6f4..e901507e5acb 100644 --- a/x11-misc/tint2/tint2-16.6.ebuild +++ b/x11-misc/tint2/tint2-16.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="battery svg startup-notification tint2conf" DEPEND=" diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index c70652e34301..ec6a57d3903e 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,7 +1,7 @@ AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0 -EBUILD xkeyboard-config-2.23.1-r1.ebuild 1143 BLAKE2B aa3ff040bb72dc32bf836bc6b9411ecf5584de9bf3b7a2e25648a774fee753ad0a8773410219519ba41bab934852afc9b430829c2a664281c9038fec515c3cd0 SHA512 178632a8720598205c048a08d7936fd45bc3c3151c9563ba74df8453c0316f873615f3c97ec52592db091c154f4e3d331badd092602671f14a1706fa0a46155e +EBUILD xkeyboard-config-2.23.1-r1.ebuild 1142 BLAKE2B e07bd105590d32a952ce69908440bd94692ac17bf8dcad3383e1b11cd001501780294446b220f53e508426d6d135ea7aeb374ede9c2522cc422bba4b16cfc857 SHA512 101cf87a7d4b1807b510134d20aad7f99797cf6410bfcb28b39b52456c3db4cb3b804789dae667c6319eed77eaf1fc3c09241692fdf05f4d6e35eca835aa524e EBUILD xkeyboard-config-2.23.1-r2.ebuild 1261 BLAKE2B 088199af13b520caba6ab45c3350be918089e3f85c56c2b5fc8a8c45adc68ce7a3de3e895a3270f87ca99b2d516ba8f8094ff34ca3838210a36983b1c0f0893a SHA512 6cf19219b1ecda60fdca85d970999db6c6027535e70d0647136d42cbfc11837afbb037382f54a3a818557d5bfad4633406cf0183cc2a5f4ebde0e5635d7af0a2 EBUILD xkeyboard-config-2.24-r1.ebuild 1203 BLAKE2B 61d85a869edc032a74113868c18be4d6e251346724b2d7093bef2e71c6f524fff450d99a12005ff64391886b4ddf08ced718877d24b83b5c20222abc9b63d8d7 SHA512 2795e9cfd326a63dd781a5c0e4e178e5ff65e3530a3146a84bc7ae4e76b5d7c927e833df5f11e41d929a49f5a57ea18fba18e2eb80dde469c9af9b9e1d766edb EBUILD xkeyboard-config-2.24.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild index f69fd4b0d123..311bf01f70d6 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="X keyboard configuration database" HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" [[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" LICENSE="MIT" diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 1cf387b57d52..b94ce7dc5e2a 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -8,6 +8,8 @@ AUX xscreensaver-5.35-gentoo.patch 1328 BLAKE2B 406f9c9d318ad3de6d5b098f54b25869 AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf2656ac63bb77ec1c21885e0dc8f213580669d8021ff2de76556e7be00bfee78f9c6adf410b50e57d404637fff83c42437bc SHA512 fbc7a4f8e296e1249c2e0454978e48ea82a7b99f2467e2f46ff65e3294f5d8b4a5e366c3b6c9bc37b7f0aca92fa6d59d7492b6310d48c0b3240953f77821408a DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561 DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7 +DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077 EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64 +EBUILD xscreensaver-5.40.ebuild 3357 BLAKE2B b1e8e9aa0d5edc8c6c831e2c75830ac785773c24f0b4d2514f0a1f3c2b384ef2a58bfafcdd0f6295e7a7070447f6f4ce3753352cb355708d4a8b3319f399ca3d SHA512 73def590ba9fbbbcda87871665197673d52fce08067d3fc375518553a6529b9b1c4082bf9e45c53c70682bca60950c0ade456810ed24fdd4995601ca3aa752b7 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b diff --git a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild new file mode 100644 index 000000000000..8a99a27c81fb --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils flag-o-matic multilib pam + +DESCRIPTION="A modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + ${HOMEPAGE}${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama" + +COMMON_DEPEND=" + >=gnome-base/libglade-2 + dev-libs/libxml2 + media-libs/netpbm + x11-apps/appres + x11-apps/xwininfo + x11-libs/gdk-pixbuf:2[X] + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86misc + x11-libs/libXxf86vm + jpeg? ( virtual/jpeg:0 ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + opengl? ( + virtual/glu + virtual/opengl + ) + pam? ( virtual/pam ) + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-util/intltool + sys-devel/bc + sys-devel/gettext + virtual/pkgconfig + x11-base/xorg-proto +" + +src_prepare() { + sed -i configure.in -e '/^ALL_LINGUAS=/d' || die + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.in} || die + fi + + eapply \ + "${FILESDIR}"/${PN}-5.05-interix.patch \ + "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ + "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ + "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ + "${FILESDIR}"/${PN}-5.31-pragma.patch \ + "${FILESDIR}"/${PN}-5.35-gentoo.patch + + use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch + + eapply_user + + eautoconf + eautoheader +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + export RPM_PACKAGE_VERSION=no #368025 + + econf \ + $(use_with jpeg) \ + $(use_with new-login login-manager) \ + $(use_with opengl gl) \ + $(use_with pam) \ + $(use_with suid setuid-hacks) \ + $(use_with xinerama xinerama-ext) \ + --enable-locking \ + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ + --with-dpms-ext \ + --with-gtk \ + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ + --with-pixbuf \ + --with-proc-interrupts \ + --with-randr-ext \ + --with-text-file="${EPREFIX}"/etc/gentoo-release \ + --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ + --with-xdbe-ext \ + --with-xf86gamma-ext \ + --with-xf86vmode-ext \ + --with-xinput-ext \ + --with-xshm-ext \ + --without-gle \ + --without-kerberos \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) +} + +src_install() { + emake install_prefix="${D}" install + + dodoc README{,.hacking} + + use pam && fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml +} diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest index 0781575f2d1e..0cb0b1a24a28 100644 --- a/x11-misc/xtermcontrol/Manifest +++ b/x11-misc/xtermcontrol/Manifest @@ -1,5 +1,5 @@ DIST xtermcontrol-3.3.tar.gz 141972 BLAKE2B c357a7c5e236100c77459cba3ff92d7cf9874646f125bf812b48fa66000f751deb00ccd86550cf5da08f40cb7cf359ee4cd913bea5d4b53819cc53ba1f6b187a SHA512 625b1ad93110032244eb277621676d89113a4c45642538b029dd36ab31e2fe9d2603c41236d2a1ffb22b2fd7feb61335f35397814569a634eb0a7d4b71961d1b DIST xtermcontrol-3.4.tar.gz 140662 BLAKE2B 8d151cf323899363e094a9d64776a80b700e959601b6c95d81fe251527187a7f5589c000b8593e059e230d46e3286732869b5d0134efdcf893eb7f4fe434e026 SHA512 a3666fc78cd8276443c8b5027ea04fec01f469e44d8b97bb9cff4159e5906e0a6b8b56069aa8d134a9d76fc19de2a7e9bd802e0d1fce6a46e164142766aef513 EBUILD xtermcontrol-3.3.ebuild 374 BLAKE2B bf70633c9c4afb87202812152092510c5766ba2df6bbbf31ac7cdb1928ebdb81d4d55316638cb2d9fcf6cd616964cbce8765d3ec3336189d719556d3500b3ba1 SHA512 448e85ed7404095ca0ad64d75b4a713895fc1f2a168d0ed8fc668241c731615c2e7e825078011fede0720ac204dbab792bf8f1da8b91f5ff0af8dcb549c86e91 -EBUILD xtermcontrol-3.4.ebuild 379 BLAKE2B 974b1256314be4e38c1dd3b460a676f14fe96b9251e87c7ff7222412c923c3111eacfa9cb5a837fd1850667f9ce9810246f933954d2e211a47426cbf55a359b4 SHA512 aa9b778ca09a9ee4b1592767e97cbcb48f83c12d8444489ef74667e3beaf652a9ee371231880b5585f3f473bec702c7885a669f8670e5b248c4a0407df66ee05 +EBUILD xtermcontrol-3.4.ebuild 374 BLAKE2B ee7beeef36e1b920961e1e41ee2b7e8644180ae60cc4b7d366995ca334c30630937b7688170a7a0e36f76795fce91dfe500419e9a2d961a1c24742310ce056bc SHA512 fda9be3d0c32fb676e2becd9fae4dcf0cdafbbb3a27f1b39bc8a3eee3ea14265d8aa3a8ec6ac62448b089b7cfcf09014badd1fc7cfcda32e998041af4d9b8c87 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild index eb12b3b9f5ff..70221c0060e6 100644 --- a/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild +++ b/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild @@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="alpha amd64 ~ia64 ppc sparc x86" IUSE="" |