diff --git a/dev-python/wikipedia/Manifest b/dev-python/wikipedia/Manifest new file mode 100644 index 0000000..c10f1ea --- /dev/null +++ b/dev-python/wikipedia/Manifest @@ -0,0 +1,2 @@ +DIST wikipedia-1.4.0.tar.gz 27748 SHA256 db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2 SHA512 56d3382c784fd16205edc5b6f34a8bac5b6fefc21856993413ba339e9e9016b9b65602ed8eaeb1fe593f8eafc6b7b049dba14427cf08e08aabc03fd971504418 WHIRLPOOL 2ea76f2e8a2e71535a037415c0ca31bce8f4307567b3fc6d52203f0c58d5b9b0b7111c6d641f76dd4136b3598fb0b95106c3436bbf0139f22aac431a762254ee +EBUILD wikipedia-1.4.0.ebuild 508 SHA256 df185c0eb49e44bd47b380f60881e4998c8bd3ab266deee1a2aff61e22d23fe7 SHA512 32fdd0767805a559679511e6794743b161fdd9b8228b4e9f536fc1b4f2897144ae4d2f342104a8ccb163379de0949ee8012dc0019dd5f4dfe0f43678a7fdef8c WHIRLPOOL 9c7c634f38487af3f3dcf7b71ebea034126fba6c49c287072cd7a6500492ffca7ca11d8cd084bdf6ba700e5cddf82e8364fb34dc5f30f6e48843aadaf9e2a38e diff --git a/dev-python/wikipedia/wikipedia-1.4.0.ebuild b/dev-python/wikipedia/wikipedia-1.4.0.ebuild new file mode 100644 index 0000000..a602165 --- /dev/null +++ b/dev-python/wikipedia/wikipedia-1.4.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Python library that makes it easy to access and parse data from Wikipedia" +HOMEPAGE="https://github.com/goldsmith/Wikipedia" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +RDEPEND=" + dev-python/beautifulsoup:4 + >=dev-python/requests-2.6.0 +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest deleted file mode 100644 index e888a6a..0000000 --- a/media-gfx/splashutils/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX libmng2-lcms2.patch 1595 SHA256 4d96ba589ae779a73b3ed2ce5514d72ce9e8a51dbc74d4b8f89f7fcac6b3a733 SHA512 81c3edf653f17a1c4c671935a2e32df0c7751414e3863bd2f48208773f509616c6f9933d9b370697edd59555c4389a8ccfaa9a6ddd24839498778af52c02ef6c WHIRLPOOL 2f1ecb077bcc0fca1bd18fb8a9636c6b45ee564b421c614b6ec8664458913f4bd933c45b44b4e1419d093faf0cb9bc60ea5a36bd186d74efc69b948e5037f9e3 -AUX miscsplashutils-0.1.8_fix-freetype-includes.patch 406 SHA256 68bccd14ac1fb5b143f454e0ddf84536e87bbc4e7318301c58c737fa3cc46e2a SHA512 136520d9e558533404212913578f44963bc4c550ceff8007a3da4d580fb338b90c5d11b3d242b0c0a81bbc8253803e8d8edad3b669c273bd35da48659a508687 WHIRLPOOL 005be0266925115ff24caa1938f55a7348383ca30cfcc600cd9a59b62eaa5ba7a1430693cfaaa1c4e89e0451981b2bbcb2f4ea338f8269601e24c708370b78ee -AUX splashutils-1.5.4.4-bzip2.patch 1539 SHA256 9596a410eb5fcadab850ac8f1d54c14d60287333a204212cfcdb1dc2dfa608ac SHA512 c42a967361b4ebe9673eb41cb3d8d120edf95708892422bed0b2a46ea501d852c6c43b9405c90b69469a9b0eb07a5159e1547d168ef04b0de8a6c7bae0651317 WHIRLPOOL 4f28bec7ffac7caa4b5fc8e931ae579bf8041b8fcf6c6b571dc9c59a329285d6a6c5943313bedfc3144a3f0848eecbe0784a27bdaf395715c57909bd5e90447c -AUX splashutils-1.5.4.4-freetype-bz2.patch 515 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0 SHA512 880cc0703de76c3c145680f1e85e461473df3dd41817757878bd18dc4c0d10484d1f93f995e6818ddcf3309e6b9febc1447ce7880006df8e08626bac5aae2e5c WHIRLPOOL 50c58afaacfd2594c1bc402c07680d742809e2af694b98acb3656f7dbc50cc85a537bec4b362c443f9dbe1054307c397cdba9613392ef6c508760d2487095265 -AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf SHA512 f5d5fd222b5dea9906e5a7541ad2ab1ff161061c6bb5e013929767d3f6aa9fe245092e201b8d42a086938be3320b77384301c22bc307cf7872daac33184127f2 WHIRLPOOL f971453383c1abf28c912a49c426c7da92ba6d44580981e89bedd4ef7df9940236e53842bd31ecb85c44c2ff31230569a33e7233498269aefc8caeacb84b9caa -AUX splashutils-1.5.4.4-multi-keyboard.patch 10158 SHA256 95a0de0a666c29c7d80fe653659191770d359f62d1edac00dc3ad97ac14d6dac SHA512 71056d599f4465ef424444d717ce1597295e0228f548c69cb36ef617075af430b1ac50f5be27bca65a50ed9e7d0169ceb256dbc66cf4b635fd9f8310d32baeae WHIRLPOOL ce782d0a6a21350fd9b00792f0eb247907b3bcf900c0e5aa8f6304d4d3c05ee59f1b036d623f25262484bd8d48ddd95a5ef086644d369c6190570be8db432112 -AUX splashutils-1.5.4.4-r3-bzip2.patch 1808 SHA256 9622dc7721e0c36538e8a1321ff59e224231578675831909d1c68f3eb9f46434 SHA512 8c1ea0bef43c4c829615db010a958ffa7c4ab8c84786a39e702be677745e47004ee59bdb1d7c80bfc637ff7c0f9a129f225e024251492b45aec7c42e1bd73da0 WHIRLPOOL 2522dcc049d68269764c9254f8884d62aa16d08fe5fa917b7c89db46617c1694c73c79f3af30c361cdd22b4d68c07b0b52c70c3243c15b263c6b5cdb6e2ef457 -AUX splashutils-1.5.4.4_fix-freetype-includes.patch 747 SHA256 b92527c18f5b402c63dc0c57e907ca537e7113d10264da0747224a7662c38b78 SHA512 0a2cb454678e16a8fb2bd169a296f957887331d75113af4af68222c8fb22de279ab606398cb00a26e3a6dad16f503b5ab614617523124dcd7fedc87f0fc55cdd WHIRLPOOL 7eb00076fedeae8e30ed11a746724919802885f8fd9d9fb27335309c5147277264c487323415d2690e1e4a247699cf77ab4834b6630e4aa219398b7446315eb5 -DIST freetype-2.3.12.tar.bz2 1453034 SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92 SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b WHIRLPOOL 1a7363b8e1cc1b4597077e6cdf7e978b80cc76e1428124312d139ee81fe5247eed5ec0243352b721c28a25a179bceb901700d0766c1a5110b19f8fe53c303a89 -DIST jpegsrc.v8a.tar.gz 962018 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d WHIRLPOOL 46e0c98f30c8d975b85b8e86b69e9c5c64632f579502b1b3c54902706d7e08b86582a85b49a0d3bfffd03cd90946fbd20171324504a5ff521eb89e6ce11d568b -DIST libpng-1.4.3.tar.bz2 658335 SHA256 2b022f39f4788505ad62a4b1f4a33286228d544719680da40f3626393ecde4a2 SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61 WHIRLPOOL d383e01e6080166816991650183b47d15938aa269c0a85e234846b9c5a7ec04a1ba7620779b4ddae639ca64440772ce8dd1b3a596f6eb32124c4d6c55592fb0a -DIST miscsplashutils-0.1.8.tar.bz2 91997 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336 SHA512 fa017e264249feda45839030728e90c82f775354c3f2c29a88362938c4a31b19e6d61f967512305642f8b96575f4d756ba197e672a361760e40080c23ec0442a WHIRLPOOL c418ee425bf323fc0e00388be4547232207fd6cac10a2e8cafeef8c8aabcd014052307533bd015e61dc483ab45edd9fbd59a3005549b7bee4a4b90bf3297394a -DIST splashutils-gentoo-1.0.17.tar.bz2 15814 SHA256 6877263d0b6f5a3532db0d6a531cd4d41fbc6c45a16c5d10050e9048ecc1af81 SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167 WHIRLPOOL de9e1ca86a87c169f0a2f7844ab9a68b29cc46c208daca4d13cf7d552b35c05b6e266d66724078cf1f6eea3d41496fdf4fd7b3219697b2032520ad2b9a5ec5c9 -DIST splashutils-lite-1.5.4.4.tar.bz2 441340 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613 WHIRLPOOL f861a1673fd9e1fe32e417da48be8c472c5c3cc06844eb0886a66b498ca38cb04a6e51708821eefe3e15f66004bb6a4ef76df7242643b34090035bffdf1f87d7 -DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4 -EBUILD splashutils-1.5.4.4-r1.ebuild 7862 SHA256 e7611890bc45fb450dd95762d2fbe6fb0674ebe05b1bb968a13a8e44f4eb5bf2 SHA512 1765798dd36786c3bc672ba7e9a9c5585e39e7305ac8a587a6562bebc07e6f82764eeb0db861392ce2cc254763240dc95eef3e0564dd882206a15c12f52cf3b9 WHIRLPOOL 270990e9ad3e12925017b4904bebcf15344f6b866c118ccc7ef9954e3bd58b21642d0b29cfc46f44eada6f412e9ba8af27871a9822cc9c5385b64314fe89b7b6 -EBUILD splashutils-1.5.4.4-r4.ebuild 7017 SHA256 a192d1d2803efcec6deb7754e9cd8cb25331ec18c5ef010d158b08127452cf85 SHA512 a2cc15fbf197d0b6b11858b4db2a0b19a047a578c8092d5d200c6f579f30537d99c9aea0c9e545e86a8504738a8ea4287050dfeff468af553de6e285d0aff0f0 WHIRLPOOL 7b8ca95ac11789b56722620a2b760e15d7cd08eb8ab2aa30f9adb252c0b227be82466f7afae8521fc1ddef775522518a332baf2cf2c6526990cf006eea625f1b -MISC metadata.xml 324 SHA256 51a25c570502116aa46bfe2bdfbb99be8a81290879563848978a9ee301a3dfa5 SHA512 4fccbcc1c6372560a0139262caf1f305cf658be6761e9703a0033da08af0d8a3dc310e1ceec52761b173fce2d6a94971fbde69ee0a419a7f00457f08691b233e WHIRLPOOL 60b68573116b7ef2a1a4fd87ab47172b56617c7d713ba44e9cdfce23283bf45ddf94ce0d4dd7d9d8ca7ab0c3af164557ec8f16ae872269b1b04b92d3a6e4781d diff --git a/media-gfx/splashutils/files/libmng2-lcms2.patch b/media-gfx/splashutils/files/libmng2-lcms2.patch deleted file mode 100644 index 553bb94..0000000 --- a/media-gfx/splashutils/files/libmng2-lcms2.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- configure-old 2014-02-03 18:49:57.524228900 +0100 -+++ configure 2014-02-03 18:54:31.920895855 +0100 -@@ -13025,13 +13025,13 @@ - MNG_LIBS="${MNG_LIBS} -lz" - fi - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCloseProfile in -llcms" >&5 --$as_echo_n "checking for cmsCloseProfile in -llcms... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsCloseProfile in -llcms2" >&5 -+$as_echo_n "checking for cmsCloseProfile in -llcms2... " >&6; } - if ${ac_cv_lib_lcms_cmsCloseProfile+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-llcms $LIBS" -+LIBS="-llcms2 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -13062,7 +13062,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lcms_cmsCloseProfile" >&5 - $as_echo "$ac_cv_lib_lcms_cmsCloseProfile" >&6; } - if test "x$ac_cv_lib_lcms_cmsCloseProfile" = xyes; then : -- MNG_LIBS="${MNG_LIBS} -llcms" -+ MNG_LIBS="${MNG_LIBS} -llcms2" - fi - - ---- configure.ac-old 2014-02-03 18:49:17.970895525 +0100 -+++ configure.ac 2014-02-03 18:53:08.964229101 +0100 -@@ -538,7 +538,7 @@ - MNG_LIBS="${MNG_LIBS} -lmng" - MNG_LIBS="${MNG_LIBS} ${JPEG_LIBS}" - AC_CHECK_LIB([z], [zlibVersion], [MNG_LIBS="${MNG_LIBS} -lz" ]) -- AC_CHECK_LIB([lcms], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms"]) -+ AC_CHECK_LIB([lcms2], [cmsCloseProfile],[MNG_LIBS="${MNG_LIBS} -llcms2"]) - ], - [AC_MSG_ERROR(['libmng' library file was not found.])] - ) diff --git a/media-gfx/splashutils/files/miscsplashutils-0.1.8_fix-freetype-includes.patch b/media-gfx/splashutils/files/miscsplashutils-0.1.8_fix-freetype-includes.patch deleted file mode 100644 index 8bf5fae..0000000 --- a/media-gfx/splashutils/files/miscsplashutils-0.1.8_fix-freetype-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -dNur a/fbtruetype/ttf.c b/fbtruetype/ttf.c ---- a/fbtruetype/ttf.c 2006-02-03 16:10:41.000000000 +0100 -+++ b/fbtruetype/ttf.c 2014-07-24 16:39:03.645062304 +0200 -@@ -13,8 +13,8 @@ - #include - #include FT_FREETYPE_H - /* #include */ --#include --#include -+#include FT_OUTLINE_H -+#include FT_TRUETYPE_IDS_H - - #include "ttf.h" - diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch deleted file mode 100644 index e821c16..0000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch +++ /dev/null @@ -1,43 +0,0 @@ - core/configure.ac | 6 ++++++ - core/src/Makefile.am | 2 +- - 2 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/core/configure.ac b/core/configure.ac -index c5fbb84..ae9e235 100644 ---- a/core/configure.ac -+++ b/core/configure.ac -@@ -616,6 +616,7 @@ AS_IF( - AC_SUBST([PNG_CFLAGS]) - AC_SUBST([PNG_LIBS]) - -+BZ2_LIBS= - AS_IF( - [test "x${config_ttf}" = "xyes"], - [ -@@ -625,8 +626,13 @@ AS_IF( - , - [AC_MSG_ERROR([freetype was not found.])] - ) -+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress], -+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"], -+ [AC_MSG_ERROR(['libbz2' library was not found.])] -+ ) - ] - ) -+AC_SUBST([BZ2_LIBS]) - - AH_TOP([#ifndef __SPLASH_CONFIG_H - #define __SPLASH_CONFIG_H]) -diff --git a/core/src/Makefile.am b/core/src/Makefile.am -index d6ce315..349b5e7 100644 ---- a/core/src/Makefile.am -+++ b/core/src/Makefile.am -@@ -190,7 +190,7 @@ fbsplashctl_SOURCES = $(fbsplashd_SOURCES) $(splash_util_SOURCES) fbspla - fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD - fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS) - fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static --fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) -+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS) - - if CONFIG_FBCON_DECOR - fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES) diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch deleted file mode 100644 index 3438fd5..0000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch +++ /dev/null @@ -1,15 +0,0 @@ -=== modified file 'fbtruetype/Makefile' ---- fbtruetype/Makefile 2011-10-01 14:10:17 +0000 -+++ fbtruetype/Makefile 2011-10-01 14:15:02 +0000 -@@ -23,8 +23,8 @@ - OBJECTS = fbtruetype.o messages.o console.o ttf.o luxisri.o - - LDFLAGS += -L$(LIBDIR) --LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm --LIBSD = -lfreetype -lm -+LIBSS = $(shell pkg-config freetype2 --libs --static) -lm -+LIBSD = $(shell pkg-config freetype2 --libs) -lm - - CFLAGS += -I/usr/include/freetype2 - COMPILE = $(CC) $(CFLAGS) - diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch deleted file mode 100644 index 4b8d513..0000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 74dda8291efae78f00bb781148c8fd4fccaeb764 -Author: Michał Januszewski -Date: Tue Jun 14 23:23:33 2011 +0200 - - Fix typo in the Gentoo initscript. - -diff --git a/gentoo/init-fbcondecor b/gentoo/init-fbcondecor -index b66f40a..ce921b6 100755 ---- a/gentoo/init-fbcondecor -+++ b/gentoo/init-fbcondecor -@@ -12,7 +12,7 @@ start() { - splash_setup - - if [ -z "${FBCONDECOR_TTYS}" ]; then -- FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER}:-12}") -+ FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER:-12}}") - fi - - local err=0 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch deleted file mode 100644 index 23f15fd..0000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-multi-keyboard.patch +++ /dev/null @@ -1,381 +0,0 @@ -diff -ru a/core/src/common.h b/core/src/common.h ---- a/core/src/common.h 2013-01-11 06:35:35.000000000 +0200 -+++ b/core/src/common.h 2013-01-11 06:34:08.000000000 +0200 -@@ -34,6 +34,10 @@ - #define PATH_PROC FBSPLASH_DIR"/proc" - #endif - -+/* Maximum number of keyboard connected to a machine. -+ * The number is big (8) to be on the safe side */ -+#define MAX_KBDS 8 -+ - /* Useful short-named types */ - typedef u_int8_t u8; - typedef u_int16_t u16; -diff -ru a/core/src/daemon.c b/core/src/daemon.c ---- a/core/src/daemon.c 2013-01-11 06:35:35.000000000 +0200 -+++ b/core/src/daemon.c 2013-01-11 06:34:08.000000000 +0200 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -29,6 +30,8 @@ - #include "common.h" - #include "daemon.h" - -+#define EV_BUF_SIZE 8 -+ - /* Threading structures */ - pthread_mutex_t mtx_tty = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_t mtx_paint = PTHREAD_MUTEX_INITIALIZER; -@@ -41,7 +44,8 @@ - int ctty = CTTY_VERBOSE; - - /* File descriptors */ --int fd_evdev = -1; -+int fd_evdevs[MAX_KBDS]; -+int evdev_count = 0; - #ifdef CONFIG_GPM - int fd_gpm = -1; - #endif -@@ -51,7 +55,6 @@ - - /* Misc settings */ - char *notify[2]; --char *evdev = NULL; - - /* Service list */ - list svcs = { NULL, NULL }; -@@ -400,56 +403,83 @@ - } - } - -+__u16 get_ev_key_pressed(int fd_evdev, int ev_buf_size, -+ struct input_event *ev_buf) { -+ size_t rb; -+ int i; -+ rb = read(fd_evdev, ev_buf, sizeof(struct input_event) * ev_buf_size); -+ if (rb < (int) sizeof(struct input_event)) -+ return 0; -+ -+ for (i = 0; i < (int) (rb / sizeof(struct input_event)); i++) { -+ if (ev_buf[i].type != EV_KEY || ev_buf[i].value != 0) -+ continue; -+ return ev_buf[i].code; -+ } -+} -+ - /* - * Event device monitor thread. - */ - void* thf_switch_evdev(void *unused) - { -- int i, h, oldstate; -- size_t rb; -- struct input_event ev[8]; -+ int i, h, oldstate, nfds, retval, fd_evdev; -+ fd_set rfds; -+ struct input_event ev_buf[EV_BUF_SIZE]; -+ __u16 key_pressed = 0; - - while (1) { -- rb = read(fd_evdev, ev, sizeof(struct input_event)*8); -- if (rb < (int) sizeof(struct input_event)) -- continue; -+ nfds = 0, fd_evdev = -1; -+ FD_ZERO(&rfds); -+ for (i = 0;i < evdev_count;i++) { -+ FD_SET(fd_evdevs[i], &rfds); -+ nfds = max(nfds, fd_evdevs[i]); -+ } - -- for (i = 0; i < (int) (rb / sizeof(struct input_event)); i++) { -- if (ev[i].type != EV_KEY || ev[i].value != 0) -- continue; -+ nfds++; - -- switch (ev[i].code) { -- case KEY_F2: -- pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); -- pthread_mutex_lock(&mtx_paint); -- if (ctty == CTTY_SILENT) { -- h = config.tty_v; -- } else { -- h = config.tty_s; -+ retval = select(nfds, &rfds, NULL, NULL, NULL); -+ if (retval == -1) -+ perror("select()"); -+ else if (retval) { -+ for (i = 0;i < evdev_count;i++) { -+ if (FD_ISSET(fd_evdevs[i], &rfds)) { -+ fd_evdev = fd_evdevs[i]; -+ break; - } -- pthread_mutex_unlock(&mtx_paint); -- pthread_setcancelstate(oldstate, NULL); -+ } -+ key_pressed = get_ev_key_pressed(fd_evdev, EV_BUF_SIZE, ev_buf); -+ if (key_pressed == -1) -+ continue; -+ switch (key_pressed) { -+ case KEY_F2: -+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate); -+ pthread_mutex_lock(&mtx_paint); -+ h = (ctty == CTTY_SILENT) ? config.tty_v : config.tty_s; -+ pthread_mutex_unlock(&mtx_paint); -+ pthread_setcancelstate(oldstate, NULL); -+ -+ /* Switch to the new tty. This ioctl has to be done on -+ * the silent tty. Sometimes init will mess with the -+ * settings of the verbose console which will prevent -+ * console switching from working properly. -+ * -+ * Don't worry about fd_tty[config.tty_s] -+ * not being protected by a mutex -- -+ * this thread is always killed before any changes -+ * are made to fd_tty[config.tty_s]. -+ */ -+ ioctl(fd_tty[config.tty_s], VT_ACTIVATE, h); -+ break; - -- /* Switch to the new tty. This ioctl has to be done on -- * the silent tty. Sometimes init will mess with the -- * settings of the verbose console which will prevent -- * console switching from working properly. -- * -- * Don't worry about fd_tty[config.tty_s] not being protected by a -- * mutex -- this thread is always killed before any changes -- * are made to fd_tty[config.tty_s]. -- */ -- ioctl(fd_tty[config.tty_s], VT_ACTIVATE, h); -- break; -- -- case KEY_F3: -- config.textbox_visible = !config.textbox_visible; -- invalidate_textbox(theme, config.textbox_visible); -- cmd_paint(NULL); -- break; -+ case KEY_F3: -+ config.textbox_visible = !config.textbox_visible; -+ invalidate_textbox(theme, config.textbox_visible); -+ cmd_paint(NULL); -+ break; - } -- } -- } -+ } /* end of else if (retval) */ -+ } /* end of while(1) */ - - pthread_exit(NULL); - } -@@ -519,7 +549,7 @@ - - /* Do we have to start a monitor thread? */ - if (update & UPD_MON) { -- if (fd_evdev != -1) { -+ if (evdev_count >= 0) { - if (pthread_create(&th_switchmon, NULL, &thf_switch_evdev, NULL)) { - iprint(MSG_ERROR, "Evdev monitor thread creation failed.\n"); - exit(3); -diff -ru a/core/src/daemon.h b/core/src/daemon.h ---- a/core/src/daemon.h 2013-01-11 06:35:35.000000000 +0200 -+++ b/core/src/daemon.h 2013-01-11 06:34:08.000000000 +0200 -@@ -40,13 +40,13 @@ - extern int fd_tty_s, fd_tty1, fd_tty0; - - /* -- * Event device on which the daemon listens for F2 keypresses. -- * The proper device has to be detected by an external program and -+ * Event devices on which the daemon listens for F2 keypresses. -+ * The proper devices have to be detected by an external program and - * then enabled by sending an appropriate command to the splash - * daemon. - */ --extern int fd_evdev; --extern char *evdev; -+extern int fd_evdevs[]; -+extern int evdev_count; - - #ifdef CONFIG_GPM - #include -diff -ru a/core/src/daemon_cmd.c b/core/src/daemon_cmd.c ---- a/core/src/daemon_cmd.c 2013-01-11 06:35:35.000000000 +0200 -+++ b/core/src/daemon_cmd.c 2013-01-11 06:34:08.000000000 +0200 -@@ -239,18 +239,35 @@ - */ - int cmd_set_event_dev(void **args) - { -- if (evdev) -- free(evdev); -- -- evdev = strdup(args[0]); -+ char *evdevs; -+ char *evdev; -+ int i, j, fd_evdev = -1; - - pthread_cancel(th_switchmon); -+ for (i = 0;i < evdev_count;i++) { -+ close(fd_evdevs[i]); -+ } -+ evdevs = strdup(args[1]); -+ evdev_count = *(int*)args[0]; -+ j = 0; -+ for (i = 0;i < evdev_count;i++, evdevs = NULL) { -+ evdev = strtok(evdevs, ","); -+ fd_evdev = open(evdev, O_RDONLY); -+ if (fd_evdev != -1) { -+ fd_evdevs[j] = fd_evdev; -+ j++; -+ } else { -+ perror("failed to open event device"); -+ } -+ } -+ if (j == 0) { /* all input devices failed to open */ -+ evdev_count = -1; -+ free(evdevs); -+ return -1; -+ } - -- if (fd_evdev != -1) -- close(fd_evdev); -- -- fd_evdev = open(evdev, O_RDONLY); -- -+ evdev_count = j; -+ free(evdevs); - switchmon_start(UPD_MON, config.tty_s); - - return 0; -@@ -524,8 +541,8 @@ - - { .cmd = "set event dev", - .handler = cmd_set_event_dev, -- .args = 1, -- .specs = "s" -+ .args = 2, -+ .specs = "ds" - }, - - { .cmd = "set message", -@@ -628,7 +645,7 @@ - continue; - - for (j = 0; j < known_cmds[i].args; j++) { -- for (; buf[k] == ' '; buf[k] = 0, k++); -+ for (; buf[k] == ' '; buf[k] = '\0', k++); - if (!buf[k]) { - args[j] = NULL; - continue; -diff -ru a/core/src/libfbsplash.c b/core/src/libfbsplash.c ---- a/core/src/libfbsplash.c 2013-01-11 06:35:35.000000000 +0200 -+++ b/core/src/libfbsplash.c 2013-01-11 06:34:08.000000000 +0200 -@@ -588,6 +588,8 @@ - return -1; - } - -+#define EVDV_BUF_LEN 128 -+ - /** - * Try to set the event device for the splash daemon. - * -@@ -595,10 +597,14 @@ - */ - int fbsplash_set_evdev(void) - { -- char buf[128]; -+ char buf[EVDV_BUF_LEN]; -+ char evdev_devs[EVDV_BUF_LEN * MAX_KBDS]; - FILE *fp; - int i, j; -- -+ int kbd_count; -+ int max_chars, chars_left, dev_path_len; -+ char dev_path[] = PATH_DEV "/input/"; -+ dev_path_len = strlen(dev_path); - char *evdev_cmds[] = { - "/bin/grep -Hsi keyboard " PATH_SYS "/class/input/input*/name | /bin/sed -e 's#.*input\\([0-9]*\\)/name.*#event\\1#'", - "/bin/grep -Hsi keyboard " PATH_SYS "/class/input/event*/device/driver/description | /bin/grep -o 'event[0-9]\\+'", -@@ -608,22 +614,43 @@ - - /* Try to activate the event device interface so that F2 can - * be used to switch from verbose to silent. */ -- buf[0] = 0; -- for (i = 0; i < sizeof(evdev_cmds)/sizeof(char*); i++) { -+ buf[0] = '\0'; -+ kbd_count = 0; -+ max_chars = sizeof(evdev_devs) / sizeof(char*); -+ chars_left = max_chars - 1; -+ evdev_devs[0] = '\0'; -+ for (i = 0; i < sizeof(evdev_cmds) / sizeof(char*); i++) { - fp = popen(evdev_cmds[i], "r"); - if (fp) { -- fgets(buf, 128, fp); -- if ((j = strlen(buf)) > 0) { -- if (buf[j-1] == '\n') -- buf[j-1] = 0; -- break; -+ while (fgets(buf, 128, fp) && kbd_count < MAX_KBDS) { -+ if ((j = strlen(buf)) > 0) { -+ if (buf[j-1] == '\n') -+ buf[j-1] = ','; -+ if (chars_left < (j + dev_path_len)) { -+ break; -+ } -+ kbd_count++; -+ strncat(evdev_devs, dev_path, chars_left); -+ chars_left -= dev_path_len; -+ strncat(evdev_devs, buf, chars_left); -+ chars_left -= j; -+ } -+ } -+ /* replace the last ',' with '\n' */ -+ if (chars_left > 0 && evdev_devs[0] != '\0') { -+ j = strlen(evdev_devs); -+ if (j > 2) { -+ evdev_devs[j - 1] = '\n'; -+ } - } - pclose(fp); - } -+ if (kbd_count > 0) -+ break; - } - -- if (buf[0] != 0) { -- fbsplash_send("set event dev " PATH_DEV "/input/%s\n", buf); -+ if (evdev_devs[0] != '\0') { -+ fbsplash_send("set event dev %d %s", kbd_count, evdev_devs); - return 0; - } else { - return -1; -@@ -661,6 +688,8 @@ - return 0; - } - -+#define MAX_CMD 2048 -+ - /** - * Send stuff to the splash daemon using the splash FIFO. - * -@@ -668,7 +697,7 @@ - */ - int fbsplash_send(const char *fmt, ...) - { -- char cmd[256]; -+ char cmd[MAX_CMD]; - va_list ap; - - if (!fp_fifo) { -@@ -690,7 +719,7 @@ - } - - va_start(ap, fmt); -- vsnprintf(cmd, 256, fmt, ap); -+ vsnprintf(cmd, MAX_CMD, fmt, ap); - va_end(ap); - - fprintf(fp_fifo, cmd); diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch deleted file mode 100644 index 13626df..0000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch +++ /dev/null @@ -1,53 +0,0 @@ - core/configure.ac | 6 ++++++ - core/src/Makefile.am | 2 +- - 2 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/core/configure.ac b/core/configure.ac -index c5fbb84..ae9e235 100644 ---- a/core/configure.ac -+++ b/core/configure.ac -@@ -616,6 +616,7 @@ AS_IF( - AC_SUBST([PNG_CFLAGS]) - AC_SUBST([PNG_LIBS]) - -+BZ2_LIBS= - AS_IF( - [test "x${config_ttf}" = "xyes"], - [ -@@ -625,8 +626,13 @@ AS_IF( - , - [AC_MSG_ERROR([freetype was not found.])] - ) -+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress], -+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"], -+ [AC_MSG_ERROR(['libbz2' library was not found.])] -+ ) - ] - ) -+AC_SUBST([BZ2_LIBS]) - - AH_TOP([#ifndef __SPLASH_CONFIG_H - #define __SPLASH_CONFIG_H]) -diff --git a/core/src/Makefile.am b/core/src/Makefile.am -index d6ce315..349b5e7 100644 ---- a/core/src/Makefile.am -+++ b/core/src/Makefile.am -@@ -121,6 +121,9 @@ - libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version) - libfbsplashrender_la_LIBADD = libfbsplash.la - -+libfbsplashrender_la_CFLAGS += $(BZ2_CFLAGS) -+libfbsplashrender_la_LIBADD += $(BZ2_LIBS) -+ - libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS) - libfbsplashrender_la_LIBADD += $(JPEG_LIBS) - -@@ -190,7 +193,7 @@ - fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD - fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS) - fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static --fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) -+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS) - - if CONFIG_FBCON_DECOR - fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES) diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4_fix-freetype-includes.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4_fix-freetype-includes.patch deleted file mode 100644 index f52a6c1..0000000 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4_fix-freetype-includes.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -dNur a/src/ttf.c b/src/ttf.c ---- a/src/ttf.c 2011-06-12 23:43:39.000000000 +0200 -+++ b/src/ttf.c 2014-07-24 16:54:19.322207452 +0200 -@@ -25,8 +25,8 @@ - #include - - #include --#include --#include -+#include FT_OUTLINE_H -+#include FT_TRUETYPE_IDS_H - - #include "common.h" - #include "render.h" -diff -dNur a/src/ttf.h b/src/ttf.h ---- a/src/ttf.h 2011-06-12 23:43:39.000000000 +0200 -+++ b/src/ttf.h 2014-07-24 16:54:30.426027477 +0200 -@@ -1,8 +1,8 @@ - #ifndef _TTF_H - #define _TTF_H - #include --#include --#include -+#include FT_OUTLINE_H -+#include FT_TRUETYPE_IDS_H - - #define CACHED_METRICS 0x10 - #define CACHED_BITMAP 0x01 diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml deleted file mode 100644 index 07123e4..0000000 --- a/media-gfx/splashutils/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -proxy-maintainers - - asaf.gery@gmail.com - - - - Support for the fbcondecor kernel patch. - - - diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild deleted file mode 100644 index 18dcd97..0000000 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild,v 1.9 2014/01/01 15:33:34 hwoarang Exp $ - -EAPI="2" - -inherit autotools eutils multilib toolchain-funcs - -MISCSPLASH="miscsplashutils-0.1.8" -GENTOOSPLASH="splashutils-gentoo-1.0.17" -V_JPEG="8a" -V_PNG="1.4.3" -V_ZLIB="1.2.3" -V_FT="2.3.12" - -ZLIBSRC="libs/zlib-${V_ZLIB}" -LPNGSRC="libs/libpng-${V_PNG}" -JPEGSRC="libs/jpeg-${V_JPEG}" -FT2SRC="libs/freetype-${V_FT}" - -RESTRICT="test" -IUSE="hardened +png +truetype +mng gpm fbcondecor" - -DESCRIPTION="Framebuffer splash utilities." -HOMEPAGE="http://fbsplash.berlios.de" -SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2 - mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2 - mirror://gentoo/${MISCSPLASH}.tar.bz2 - mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2 - ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz - mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2 - http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -RDEPEND="gpm? ( sys-libs/gpm[static-libs] ) - truetype? ( >=media-libs/freetype-2[static-libs] - || ( =media-libs/libpng-1.4.3[static-libs] ) - mng? ( - media-libs/lcms:0[static-libs] - || ( media-libs/libmng[static-libs] =sys-apps/baselayout-1.9.4-r5 - app-arch/cpio - media-gfx/fbgrab - !sys-apps/lcdsplash" -DEPEND="${RDEPEND} - >=dev-libs/klibc-1.5 - virtual/pkgconfig" - -S="${WORKDIR}/${P/_/-}" -SG="${WORKDIR}/${GENTOOSPLASH}" -SM="${WORKDIR}/${MISCSPLASH}" - -pkg_setup() { - if use hardened; then - ewarn "Due to problems with klibc, it is currently impossible to compile splashutils" - ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with" - ewarn "-fno-stack-protector. Hardened GCC features will not be used while building" - ewarn "the splash kernel helper." - fi -} - -src_prepare() { - mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs" - # We need to delete the Makefile and let it be rebuilt when splashutils - # is being configured. Either that, or we end up with a segfaulting kernel - # helper. - rm "${S}/libs/zlib-${V_ZLIB}/Makefile" - - if use truetype ; then - epatch "${FILESDIR}/splashutils-1.5.4.4_fix-freetype-includes.patch" - fi - - cd "${SG}" - epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" - - if use truetype ; then - cd "${SM}" - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" - epatch "${FILESDIR}/miscsplashutils-0.1.8_fix-freetype-includes.patch" - fi - - cd "${S}" - ln -sf "${S}/src" "${WORKDIR}/core" - - epatch "${FILESDIR}/${P}-bzip2.patch" - epatch "${FILESDIR}/libmng2-lcms2.patch" - - if ! tc-is-cross-compiler && \ - has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then - ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile" - ewarn "splashutils, you're on your own, as this configuration is not supported." - else - # This should make splashutils compile on systems with hardened GCC. - sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in" - fi - - if ! use truetype ; then - sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" - fi - - # Latest version of klibc defined its own version of ferror, so there is - # not need for the hack in klibc_compat.h - if has_version ">=dev-libs/klibc-1.5.20"; then - echo > "libs/klibc_compat.h" - fi - - rm -f m4/* - eautoreconf -} - -src_configure() { - tc-export CC - cd "${SM}" - emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils" - - cd "${S}" - econf \ - $(use_with png) \ - $(use_with mng) \ - $(use_with gpm) \ - $(use_with truetype ttf) \ - $(use_with truetype ttf-kernel) \ - $(use_enable fbcondecor) \ - --docdir=/usr/share/doc/${PF} \ - --with-freetype2-src=${FT2SRC} \ - --with-jpeg-src=${JPEGSRC} \ - --with-lpng-src=${LPNGSRC} \ - --with-zlib-src=${ZLIBSRC} \ - --with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils" -} - -src_compile() { - emake CC="${CC}" STRIP="true" || die "failed to build splashutils" - - if has_version ">=sys-apps/baselayout-1.13.99"; then - cd "${SG}" - emake LIB=$(get_libdir) || die "failed to build the splash plugin" - fi -} - -src_install() { - local LIB=$(get_libdir) - - cd "${SM}" - make DESTDIR="${D}" LIB=${LIB} install || die - - cd "${S}" - make DESTDIR="${D}" STRIP="true" install || die - - mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/ - gen_usr_ldscript libfbsplash.so - - echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash - doenvd 99splash - - if use fbcondecor ; then - newinitd "${SG}"/init-fbcondecor fbcondecor - newconfd "${SG}"/fbcondecor.conf fbcondecor - fi - newconfd "${SG}"/splash.conf splash - - insinto /usr/share/${PN} - doins "${SG}"/initrd.splash - - insinto /etc/splash - doins "${SM}"/fbtruetype/luxisri.ttf - - if has_version ">=sys-apps/baselayout-1.13.99"; then - cd "${SG}" - make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin" - else - cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/ - fi - - sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh - keepdir /${LIB}/splash/{tmp,cache,bin,sys} - dosym /${LIB}/splash/bin/fbres /sbin/fbres -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-1.0" - previous_less_than_1_0=$? - - has_version "<${CATEGORY}/${PN}-1.5.3" - previous_less_than_1_5_3=$? -} - -pkg_postinst() { - if has_version sys-fs/devfsd || ! has_version virtual/udev ; then - elog "This package has been designed with udev in mind. Other solutions, such as" - elog "devfs or a static /dev tree might work, but are generally discouraged and" - elog "not supported. If you decide to switch to udev, you might want to have a" - elog "look at 'The Gentoo udev Guide', which can be found at" - elog " http://www.gentoo.org/doc/en/udev-guide.xml" - elog "" - fi - - if [[ $previous_less_than_1_0 = 0 ]] ; then - elog "Since you are upgrading from a pre-1.0 version, please make sure that you" - elog "rebuild your initrds. You can use the splash_geninitramfs script to do that." - elog "" - fi - - if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then - elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch" - elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish" - elog "to use fbcondecor, run:" - elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use" - elog "and re-emerge splashutils." - fi - - if ! test -f /proc/cmdline || - ! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then - elog "It is required that you add 'console=tty1' to your kernel" - elog "command line parameters." - elog "" - elog "After these modifications, the relevant part of the kernel command" - elog "line might look like:" - elog " splash=silent,fadein,theme:emergence console=tty1" - elog "" - fi - - if ! has_version 'media-gfx/splash-themes-livecd' && - ! has_version 'media-gfx/splash-themes-gentoo'; then - elog "The sample Gentoo themes (emergence, gentoo) have been removed from the" - elog "core splashutils package. To get some themes you might want to emerge:" - elog " media-gfx/splash-themes-livecd" - elog " media-gfx/splash-themes-gentoo" - fi - - elog "Please note that the 'fbsplash' kernel patch has now been renamed to" - elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called" - elog "'fbcondecor'. Make sure you update your system. See:" - elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history" - elog "for further info about the name changes." - elog "" - elog "Also note that splash_util has now been split into splash_util, fbsplashd" - elog "and fbcondecor_ctl." -} diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild deleted file mode 100644 index 819f60c..0000000 --- a/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild,v 1.1 2013/10/14 13:50:25 pinkbyte Exp $ - -EAPI=5 -inherit autotools eutils multilib toolchain-funcs - -MISCSPLASH="miscsplashutils-0.1.8" -GENTOOSPLASH="splashutils-gentoo-1.0.17" -V_JPEG="8a" -V_PNG="1.4.3" -V_ZLIB="1.2.3" -V_FT="2.3.12" - -ZLIBSRC="libs/zlib-${V_ZLIB}" -LPNGSRC="libs/libpng-${V_PNG}" -JPEGSRC="libs/jpeg-${V_JPEG}" -FT2SRC="libs/freetype-${V_FT}" - -RESTRICT="test" -IUSE="hardened +png +truetype +mng gpm fbcondecor" - -DESCRIPTION="Framebuffer splash utilities" -HOMEPAGE="http://fbsplash.berlios.de" -SRC_URI=" - mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2 - mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2 - mirror://gentoo/${MISCSPLASH}.tar.bz2 - mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2 - ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz - mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2 - http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - gpm? ( sys-libs/gpm[static-libs(+)] ) - truetype? ( - >=media-libs/freetype-2[static-libs] - app-arch/bzip2[static-libs(+)] - sys-libs/zlib[static-libs(+)] - ) - png? ( - >=media-libs/libpng-1.4.3[static-libs] - sys-libs/zlib[static-libs(+)] - ) - mng? ( - media-libs/lcms:0[static-libs] - media-libs/libmng[static-libs(+)] - ) - virtual/jpeg:0[static-libs] - app-arch/cpio - media-gfx/fbgrab - !sys-apps/lcdsplash" - -DEPEND="${RDEPEND} - >=dev-libs/klibc-1.5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P/_/-}" -SG="${WORKDIR}/${GENTOOSPLASH}" -SM="${WORKDIR}/${MISCSPLASH}" - -pkg_setup() { - if use hardened; then - ewarn "Due to problems with klibc, it is currently impossible to compile splashutils" - ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with" - ewarn "-fno-stack-protector. Hardened GCC features will not be used while building" - ewarn "the splash kernel helper." - fi -} - -src_prepare() { - mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs" - - # We need to delete the Makefile and let it be rebuilt when splashutils - # is being configured. Either that, or we end up with a segfaulting kernel - # helper. - rm "${S}/libs/zlib-${V_ZLIB}/Makefile" - - if use truetype ; then - epatch "${FILESDIR}/splashutils-1.5.4.4_fix-freetype-includes.patch" - fi - - cd "${SG}" - epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" - - if use truetype ; then - cd "${SM}" - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" - epatch "${FILESDIR}/miscsplashutils-0.1.8_fix-freetype-includes.patch" - - fi - - cd "${S}" - ln -sf "${S}/src" "${WORKDIR}/core" - - epatch "${FILESDIR}/${P}-bzip2.patch" - epatch "${FILESDIR}/${P}-multi-keyboard.patch" - epatch "${FILESDIR}/libmng2-lcms2.patch" - - if ! tc-is-cross-compiler && \ - has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then - ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile" - ewarn "splashutils, you're on your own, as this configuration is not supported." - else - # This should make splashutils compile on systems with hardened GCC. - sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in" - fi - - if ! use truetype ; then - sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" - fi - - # Latest version of klibc defined its own version of ferror, so there is - # not need for the hack in klibc_compat.h - if has_version ">=dev-libs/klibc-1.5.20"; then - echo > "libs/klibc_compat.h" - fi - - rm -f m4/* - eautoreconf -} - -src_configure() { - tc-export CC - cd "${SM}" - emake CC="${CC}" LIB=$(get_libdir) STRIP=true - - cd "${S}" - econf \ - $(use_with png) \ - $(use_with mng) \ - $(use_with gpm) \ - $(use_with truetype ttf) \ - $(use_with truetype ttf-kernel) \ - $(use_enable fbcondecor) \ - --docdir=/usr/share/doc/${PF} \ - --with-freetype2-src=${FT2SRC} \ - --with-jpeg-src=${JPEGSRC} \ - --with-lpng-src=${LPNGSRC} \ - --with-zlib-src=${ZLIBSRC} \ - --with-essential-libdir=/$(get_libdir) -} - -src_compile() { - emake CC="${CC}" STRIP="true" - - cd "${SG}" - emake LIB=$(get_libdir) -} - -src_install() { - local LIB=$(get_libdir) - - cd "${SM}" - emake DESTDIR="${D}" LIB=${LIB} install - - cd "${S}" - emake DESTDIR="${D}" STRIP="true" install - - mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/ - gen_usr_ldscript libfbsplash.so - - echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash - doenvd 99splash - - if use fbcondecor ; then - newinitd "${SG}"/init-fbcondecor fbcondecor - newconfd "${SG}"/fbcondecor.conf fbcondecor - fi - newconfd "${SG}"/splash.conf splash - - insinto /usr/share/${PN} - doins "${SG}"/initrd.splash - - insinto /etc/splash - doins "${SM}"/fbtruetype/luxisri.ttf - - cd "${SG}" - make DESTDIR="${D}" LIB=${LIB} install - - sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh - keepdir /${LIB}/splash/{tmp,cache,bin,sys} - dosym /${LIB}/splash/bin/fbres /sbin/fbres -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-1.0" - previous_less_than_1_0=$? - - has_version "<${CATEGORY}/${PN}-1.5.3" - previous_less_than_1_5_3=$? -} - -pkg_postinst() { - if has_version sys-fs/devfsd || ! has_version virtual/udev ; then - elog "This package has been designed with udev in mind. Other solutions, such as" - elog "devfs or a static /dev tree might work, but are generally discouraged and" - elog "not supported. If you decide to switch to udev, you might want to have a" - elog "look at 'The Gentoo udev Guide', which can be found at" - elog " http://www.gentoo.org/doc/en/udev-guide.xml" - elog "" - fi - - if [[ $previous_less_than_1_0 = 0 ]] ; then - elog "Since you are upgrading from a pre-1.0 version, please make sure that you" - elog "rebuild your initrds. You can use the splash_geninitramfs script to do that." - elog "" - fi - - if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then - elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch" - elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish" - elog "to use fbcondecor, run:" - elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use" - elog "and re-emerge splashutils." - fi - - if ! test -f /proc/cmdline || - ! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then - elog "It is required that you add 'console=tty1' to your kernel" - elog "command line parameters." - elog "" - elog "After these modifications, the relevant part of the kernel command" - elog "line might look like:" - elog " splash=silent,fadein,theme:emergence console=tty1" - elog "" - fi - - if ! has_version 'media-gfx/splash-themes-livecd' && - ! has_version 'media-gfx/splash-themes-gentoo'; then - elog "The sample Gentoo themes (emergence, gentoo) have been removed from the" - elog "core splashutils package. To get some themes you might want to emerge:" - elog " media-gfx/splash-themes-livecd" - elog " media-gfx/splash-themes-gentoo" - fi -} diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest index 5cac525..73c5f5e 100644 --- a/media-sound/lollypop/Manifest +++ b/media-sound/lollypop/Manifest @@ -1,2 +1,2 @@ -DIST lollypop-0.9.32.tar.xz 424916 SHA256 c23b2b24f8f899d2c91c4890d5744a38b3fcfac5e9cf7777c5dafa8e129fdd2e SHA512 7da6a077b3d750185046180baa05719aaefd9ca394d1b65fbb05952f3a425fe750afdec7110a146b6f72ba52601cfd12d1ff76ed75acb315c9101844c279ae57 WHIRLPOOL 3b8fe6ecb3371f5de723e5c262dd08ae3c11631cce359a92e8f721462ae77762a5a00c7d1988434db1e9bc384500bcfd4e95be39ba726f926452d8ee668a8721 -EBUILD lollypop-0.9.32.ebuild 1177 SHA256 5d0150b5cbbe7748094a4cda39361996e3fdbe3e576c5fa9f096efbff2d0e397 SHA512 0a7ab85ecb97a9e9e387ca69d24ce6a1a624a68e805fc0c9292dfef4ca9d3304bab7892551ec8ac5a3788ab823931238d5db9c45848f04cb57cfb7c132bd7bd1 WHIRLPOOL 55085a214c4334f8c8b3d4d3d86fb1f811dd7e2f9f2cfb4fd2ba0fe765c3da28b6221e43ce460611880e2d34b2ecfda8597108d592ddc6146cec1b30067f7bbb +DIST lollypop-0.9.42.tar.xz 440828 SHA256 65d44d073a249d9c9562ed1bbda65bb28173ab86df5dd045034b34e346110d20 SHA512 07a1296bc4bff77b5726d2fdef4a3afd8a11aa9ab3022b1632ac67e523e1dd26cbc0ff607c7c488b5f0ddedee440b55c369c83dea6713dce87e61b77f4b71413 WHIRLPOOL 1164019d8c84f8c80d607628816f174941082bdeb05f6570e8cf25284c593dd62b084ebf3e1bd7586f0acec5b53ea3b0b3b5795b05f355f3ff887af4f842adb0 +EBUILD lollypop-0.9.42.ebuild 1255 SHA256 26a486e3232f98fa40626f7fe5cce16143f2ae69ad902004544c0c2d2260bfd1 SHA512 fbd6de11b3925253f5d34b3da9f262aab08a3e9cab380c6ed36227d8df97019a0dc860889ecc4f1e0a4640b262bcbe2e80c410b9be558c151c09574be115833f WHIRLPOOL 367207e6b74b6799b06763085b8d25d7621b1a7a101fd5775c9aa4b2452a3b0eb7c1294cbfc81c156605eb394ba019fa7f8a5770662b72afced89d851db9c079 diff --git a/media-sound/lollypop/lollypop-0.9.32.ebuild b/media-sound/lollypop/lollypop-0.9.42.ebuild similarity index 85% rename from media-sound/lollypop/lollypop-0.9.32.ebuild rename to media-sound/lollypop/lollypop-0.9.42.ebuild index 45aa63a..b35c70c 100644 --- a/media-sound/lollypop/lollypop-0.9.32.ebuild +++ b/media-sound/lollypop/lollypop-0.9.42.ebuild @@ -16,9 +16,9 @@ SRC_URI="https://github.com/gnumdk/lollypop/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="" +IUSE="+lastfm +wikipedia" -IUSE+=" +python_single_target_python3_3 python_single_target_python3_4" +IUSE+=" python_single_target_python3_3 +python_single_target_python3_4" RDEPEND="${PYTHON_DEPS} >=x11-libs/gtk+-3.13.2:3[introspection] @@ -26,8 +26,9 @@ RDEPEND="${PYTHON_DEPS} dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] media-libs/gstreamer:1.0[introspection] - >=dev-python/pylast-1.0.0 >=dev-libs/totem-pl-parser-3.10.4 + lastfm? ( >=dev-python/pylast-1.0.0 ) + wikipedia? ( >=dev-python/wikipedia-1.4.0 ) " DEPEND="${RDEPEND} >=dev-util/intltool-0.26 diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest index 5739491..dfad61e 100644 --- a/media-tv/tvheadend/Manifest +++ b/media-tv/tvheadend/Manifest @@ -1,6 +1,6 @@ AUX tvheadend.confd 355 SHA256 1dd2bed597ccb84e59beae0ec130287f31a4cc2c2e974708462f08d8885b2e5e SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b WHIRLPOOL 156a098daf40f42098e3c6862ef307784a882a7e80e269525d702fd17a458b479911c41a3017621cf55cbd96d281fad0de1e6e59b6bb0f0d729cf94d2384343a AUX tvheadend.initd 375 SHA256 696dee0e0959cd2358b5250f89a9faf8db95172e55658ec8827e7d4999d0114e SHA512 df6b66aef890f18f3fb21900b7015e2bd4f4d876fd68a04198a9424aca0d61dea5febf503609e90d0cc1e8a4fdf139cabcb5b0ab0064423aeb7c366e3607e392 WHIRLPOOL 1dc4bd1bcacc01ff6e72cc01f7305c86dffccecfe189345ab99045521e39ff09af75a39dec702033179a113d3785db5431e706a31684f9a37c2ac47475abe575 AUX tvheadend.service 304 SHA256 e4ed1f5a50620773cbffff9a22d6ea06311965a6ce139eb8d9f67df10986aecd SHA512 96c61ef4082ecf77ca17a377de3698ae2a47c29519e02676a28d1d2813d5f43dfc3b29d8b91a126a7b8da5f38a8dc2cf13044dba285e22235e7782053041207f WHIRLPOOL 704fb969e5d954330e12c1d4cafa588738cfac4c65d2a234cb8d9a46180a9e33ead0532d94d94fce4efaac566859ec21e4d6f548c56b42a89b7a4f82733a5b53 -DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a WHIRLPOOL b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca -EBUILD tvheadend-3.4.27.ebuild 2269 SHA256 43bf0c35407f24f07bb03e7147c53816cfee1675ccf204665e179b219714f4e5 SHA512 14b390bad742d86b32dea413eadff4d8c15590dc7c1e458766b0c4e54fe3dff454fe35eb968cc039ac33243d0dbecc4f74290e4fabb6285632df519fdacd1e1c WHIRLPOOL c9be804dd8f5f3f76414497120174328da8e668099b8a8843857f4c36bdd77a30c694018966dcd024683506ffee858570a5a8e20d582c94a67a2c2f39bc0f93b +DIST tvheadend-4.0.5.tar.gz 15827588 SHA256 3dcd1486dba2a5b84fe60e8c1a8c5e8abb593154e9394f2ae67a4d6eb0c720c2 SHA512 e70eb42cc76b4fbe7ca3445ec41f8346b9f8dd2fd2800f61ad7114c07ae0fb37c00e17e9adde6350fd2053652e13b8a75ac6663dd58ad66795593d7603f527ff WHIRLPOOL 507bbf74ce1f73c23bf82208f8eb5e4178f6ff3f10d39edba747894a6788ef82c8729940d62246536e17c09408818b5f714b1e565066506f9c22a31ab9561a80 +EBUILD tvheadend-4.0.5.ebuild 2089 SHA256 fbbcc457b165748e36934bcb5b4af436bc8cb357f4389e765305c8bd3575b312 SHA512 4172c6d0340dc2617e2e75da2c79b436e3497582806836cee2b05257e649f9af468bd3ed8b8822139b7bcb600a2bb73f9570aeedd62d4f40420cfd9fa408d166 WHIRLPOOL 8312ccc053b76f6a36c7c793168bc95916d8682ce8626158d2e784c720ebc336cf5113cbd54c43a1fc70b09a001612f85a7933ac75bc3ad3c44be833aeb2fb87 MISC metadata.xml 680 SHA256 cae89f8e93e76331fa12ee21179be82d8fad25f2b8d95a1661ed09283976108f SHA512 55a95b040de4838133e471d1dc173adfe935e66fc3536d0654ab6c6f3def9addbdc69248cefc358c4e32b63aa4b4048636dfdceaf49d9fab54119992dc244a29 WHIRLPOOL 0171e4199e1c88f42baf1d0e63041d93f8b395e18ffcc6008a565d4284d7c1e6d1c047f1d3cd5f579f4a5452110562f76e9fce50fd604513069b8ff433396cb2 diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-4.0.5.ebuild similarity index 87% rename from media-tv/tvheadend/tvheadend-3.4.27.ebuild rename to media-tv/tvheadend/tvheadend-4.0.5.ebuild index 006bbdf..f302a25 100644 --- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.5.ebuild @@ -6,11 +6,9 @@ EAPI=5 inherit eutils linux-info systemd toolchain-funcs user -MY_PV="3.4patch1" - DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" HOMEPAGE="https://tvheadend.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -33,21 +31,15 @@ RDEPEND="${DEPEND} dvbscan? ( media-tv/linuxtv-dvb-apps ) xmltv? ( media-tv/xmltv )" -S="${WORKDIR}/${PN}-${MY_PV}" - CONFIG_CHECK="~INOTIFY_USER" -DOCS=( README ) +DOCS=( README.md ) pkg_setup() { enewuser tvheadend -1 -1 /dev/null video } src_prepare() { - # set the version number - echo "const char *tvheadend_version = \"${PV}\";" \ - > src/version.c || die "setting version failed!" - # remove '-Werror' wrt bug #438424 sed -e 's:-Werror::' -i Makefile || die 'sed failed!' } diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest deleted file mode 100644 index 2b0df8d..0000000 --- a/media-video/totem/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX totem-3.14.2-0001-bump-required-grilo-version.patch 579 SHA256 78551cef79aada77233d5b0caa44b8cae44a5ab514227701c3853db444b266e9 SHA512 deaad1eecc2a4d2cac3d19bdc045878e8bbcfcdbe02bff4ddd409fe683118c50d1970348221a7b8d74cf233e134b1fb921fd365cbaa29f36246ed1b4a1eb3c5d WHIRLPOOL 1937254a7a276f727b1bd0c6ccb23bbc84ef930e38fdf2a776084b33f65e6c5031498002c99da19461739c2e4dcc29fec6da707126e25e58d9e5459f136698c8 -AUX totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch 2786 SHA256 317212cdd0896d39617e967794db94a214fe4672cf8aeb97c9656d99d18f45e9 SHA512 b60a04ba78a8008542bbd1bcaad57acd265821ad2d34f16daaf6d1c3337789fd4a699e41088de238ae30291b1b64986de28ea712a7b5c4b04c27b0b05b349df2 WHIRLPOOL f24809b3899b2dd65526aa967a9e2e4ceeaa9326ddebc768760aa748c11827148bb351b84478e213cf0adac8c0c133be939f921f435c5fcbbf77df234f999da1 -AUX totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch 994 SHA256 866c7cffdb66e341aa040dc7823262ffd3eadb806d41059ada0abfbebded48cb SHA512 518644132440aa35bc45ef2783710dbabcd65aca2e716325bd1fbd9377556a1c6229803ded08dc9431e8642637ad1b44ab6b39407523679eee36a388f1e6d61c WHIRLPOOL 64d3cbd769417db51ad969e3abf3318fda0ff4443b4a9a46f80622deba8cc0b03ab567c2ff1920ea804220414b0100b9b6a8505f12cd0abbb2855f7a4a3bfafe -AUX totem-3.14.2-0004-don-t-monitor-tracker.patch 752 SHA256 f439fb5a7ef87217bebdf8228e28509e2822ed51853856f71ea03417d765db72 SHA512 797ff8ee777673054bb38e2a6b53874e8b09949243b8310ac811cb514e5712d11658b33ed2037f52b51519b84abe4dd2392860ab6e7f1ceb7b1a987b418bd7d3 WHIRLPOOL 5913d027f651bda38cbb6724db27ac79de7c5555da383e1a02d2cc7c220b7303fd4fb39c21429488f5b4021fb6249cc4c27698f25eb83976646362be34aefcf5 -AUX totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch 847 SHA256 b19a58535ed40c1f0d020fd3a2d4624ec5285ca23367684ae13b22e193a55301 SHA512 0019219e0a398439a48d80deffa99595199b82992faaafab92bb516de8aa1cced792a7654130581ea6a7633102361ea5f212371c1eff5e2781724a5e8a062016 WHIRLPOOL fed0d922aa4525918cf9132e769bea7a3c996f64e62b927697ec2544210467526a7aede0030bce07bbfb9d87d666020b212fe20aeb8d1ffb80f8b0c5d1887656 -AUX totem-3.14.2-0006-add-debug-statements.patch 839 SHA256 ffe6a457573b5e9642d652ee181a855dcafe40683e1163a5b9e487c648f36736 SHA512 f7d33952c8c11a7b671ba4cd8c3f8282ed6e6f333f2aaf5065ecca677a54679653338e0f2bb3f1a16992f2379f851c917a4f51695bd4f4be99f3a58903b06ea4 WHIRLPOOL cd35f14fd7883e2edbdb3bb744551927e779e3a48ad5397f7346fecf16e6d8a6f0647ae71c3cdd59324f5dd9cc34f3709d6a0eabab363154d600abe1463c38d2 -AUX totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch 3044 SHA256 705219a4a89591d413b02bf2dcdebd1eabea277dd2e739c89e3ef8ca4d29a806 SHA512 9943e82330a12bca51cff1edabfc8e48f4c24217d9035f2ced98dd9f7c6fe4a2b7c5913dcbcf1b19b74f7a2424441b9b62327ee49edf6eb0cc3caa61907da213 WHIRLPOOL 7e3535ef8ae8f4690a327c6195d8cd776f982facfda8f2dd9fba70eb87e0231277c3f23659e3c72244970ab8294424952493b86cb4dde59e5fe77a57678edf85 -AUX totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch 733 SHA256 40cf9cd663856135081fc2e7c009056657f6d67f9a512cbc15c7bf0634ab3805 SHA512 0e3a8b729c77e7e6a10c0f1c01ce7ac2189e6357385ba7f0c6fe9cc5921e353bdd299834fb428bf8cfcae0bfdfa2ab8e0f145d54d4433946c10963e14eb15fa1 WHIRLPOOL 3fededbc961ed6ccef17ba0efa4ce294d80a40e6280a44ca9a103f190b824853c6c558f190ef30d86a320c5b3162b5ec9060f9b70c97af45585d7ec5c6c6a409 -AUX totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch 1403 SHA256 ff80ae81f55fab9b197f9bae25d6bff88f7f9c67c2e73165fdca07d50acb5685 SHA512 4815c6a3066130b2beeed9144a628217663f9a4ce2c815555d442ed4dbd853bce4a0d58eb180b7aac88421e09547fde277474d1b46aacafc98bd28add35c03d9 WHIRLPOOL d5b616ce725881c3c5ce1b544e389e9542d0009a60ad67d20fd629e5bd9efd196fe63192802d46d404570fad198a111e56a3aab9a77add49b7762992ed65e79a -AUX totem-3.14.2-0010-fix-detection-of-valac.patch 1026 SHA256 ffbae986072906a34ebdcf3ee07a2f7a2d72746e4269a676ddc811b52321d6ea SHA512 517e20777075daa99e5602478e77001aa333a4bc58ade9e13d354c3d43d082f1805e20c6d9658b5dde7109bdf072b2b62fe7cb8dab29fffe9c78da05ec8ea569 WHIRLPOOL 5450d66c5a3fb350be13c90ff5456a38aa43a22ae023da33df93b4c852b6b79200fd39f825bbd8acf563886d9a45ad5615a544f0bd8fc6d668a6ac7043407007 -DIST totem-3.14.2.tar.xz 3240668 SHA256 967dcf3070365a82873e5bc678299d5fb058f87f151d1e22d60313fab2ac09cc SHA512 bff15cbeb59ecfd03177c4630f8eda257ff386f3b2da933c164765ec2bd5373374e0389a46701fb97df3d57718e0c9af446c3f3cc748a956abad066008a7d17b WHIRLPOOL 5ab04a55f5d35b8a11d90dea0ea33630d3e53aa0030965114e69b4c031440f1df7f47829d4fb1953f55f30d9aa97d1e4ef694d4567297ccebff46879fd14268b -EBUILD totem-3.14.2-r1.ebuild 4774 SHA256 9e32f17b27b62074c225b74e1ca536e08e871ceb15bb8abfd8afa540b9bc9805 SHA512 3ae8aa1299edfec7bc7faf0c280c8c2be5bee28bc3dba9bc3589d14b9eb6cef386b37067b4bcc2b0bbaa5f0955a05f6bf9f98195fdcb60d4149bc0af6156c6af WHIRLPOOL 47d83cdb9b714ab3f3785e7fdafc49048ea3f512938b651d056fb5422667fc828dd98eb9d88ba21b26accff9e8e5ddb5e582c7d749574d434a35fb995d453319 diff --git a/media-video/totem/files/totem-3.14.2-0001-bump-required-grilo-version.patch b/media-video/totem/files/totem-3.14.2-0001-bump-required-grilo-version.patch deleted file mode 100644 index 3d96da0..0000000 --- a/media-video/totem/files/totem-3.14.2-0001-bump-required-grilo-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ef3da6bbf05dfdc8d0c289f3134b67f3eea925e9 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 11 Feb 2015 11:49:47 +0100 -Subject: build: Bump required grilo for GRL_METADATA_KEY_TITLE_FROM_FILENAME - -https://bugzilla.gnome.org/show_bug.cgi?id=744315 - -diff --git a/configure.ac b/configure.ac -index 65e3069..20ec003 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ VALA_REQS=0.14.1 - PEAS_REQS=1.1.0 - PYTHON_REQS=2.3 - PYGOBJECT_REQS=2.90.3 --GRILO_REQS=0.2.10 -+GRILO_REQS=0.2.11 - GRILO_PLS_REQS=0.2.1 - LIBXML_REQS=2.6.0 - --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch b/media-video/totem/files/totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch deleted file mode 100644 index e4b079b..0000000 --- a/media-video/totem/files/totem-3.14.2-0002-fix-doubling-files-added-on-the-cmd-line.patch +++ /dev/null @@ -1,83 +0,0 @@ -From ea29374ebcdb0877832f6eeb61451571bb13bdc4 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 22 Apr 2015 13:28:38 +0200 -Subject: main: Fix (again) doubling files added on the cmd line - -When handling local command-line options, we would process all the -options and send them as "remote" commands through totem. But the -"remote-command" action would activate the application first. Thus we -would do something like: -- process command-line options in totem_object_app_handle_local_options() -which calls totem_options_process_for_server(), which sends out -"remote-command" actions -- when handling "remote-command", to make sure that the application is -actually ready, we call "activate". -- but we didn't clear the filenames struct member in optionstate, so we -process it again in "activate" - -With help from Carlos Maddela - -https://bugzilla.gnome.org/show_bug.cgi?id=740995 - -diff --git a/src/totem-options.c b/src/totem-options.c -index f48bf74..daba578 100644 ---- a/src/totem-options.c -+++ b/src/totem-options.c -@@ -78,11 +78,12 @@ totem_send_remote_command (Totem *totem, - } - - void --totem_options_process_for_server (Totem *totem, -- const TotemCmdLineOptions *options) -+totem_options_process_for_server (Totem *totem, -+ TotemCmdLineOptions *options) - { - TotemRemoteCommand action; - GList *commands, *l; -+ char **filenames; - int i; - - commands = NULL; -@@ -103,12 +104,15 @@ totem_options_process_for_server (Totem *totem, - action = TOTEM_REMOTE_COMMAND_ENQUEUE; - } - -+ filenames = options->filenames; -+ options->filenames = NULL; -+ - /* Send the files to enqueue */ -- for (i = 0; options->filenames && options->filenames[i] != NULL; i++) { -+ for (i = 0; filenames && filenames[i] != NULL; i++) { - const char *filename; - char *full_path; - -- filename = options->filenames[i]; -+ filename = filenames[i]; - full_path = totem_create_full_path (filename); - - totem_send_remote_command (totem, action, full_path ? full_path : filename); -@@ -122,6 +126,8 @@ totem_options_process_for_server (Totem *totem, - } - } - -+ g_clear_pointer (&filenames, g_strfreev); -+ - if (options->playpause) { - commands = g_list_append (commands, GINT_TO_POINTER - (TOTEM_REMOTE_COMMAND_PLAYPAUSE)); -diff --git a/src/totem-options.h b/src/totem-options.h -index cdc3888..662b775 100644 ---- a/src/totem-options.h -+++ b/src/totem-options.h -@@ -55,7 +55,7 @@ extern TotemCmdLineOptions optionstate; - - void totem_options_register_remote_commands (Totem *totem); - void totem_options_process_for_server (Totem *totem, -- const TotemCmdLineOptions* options); -+ TotemCmdLineOptions* options); - - G_END_DECLS - --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch b/media-video/totem/files/totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch deleted file mode 100644 index 21d110b..0000000 --- a/media-video/totem/files/totem-3.14.2-0003-simplify-test-whether-to-monitor-a-source.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dc35bff8a374ba1cf28212a79e15609f7acfdcd3 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Sun, 29 Mar 2015 15:22:18 +0200 -Subject: grilo: Simplify test whether to monitor a source - -A little bit cleaner. - -diff --git a/src/totem-grilo.c b/src/totem-grilo.c -index 7408a9b..20580dd 100644 ---- a/src/totem-grilo.c -+++ b/src/totem-grilo.c -@@ -1297,12 +1297,12 @@ source_added_cb (GrlRegistry *registry, - MODEL_RESULTS_IS_PRETHUMBNAIL, TRUE, - MODEL_RESULTS_CAN_REMOVE, can_remove (source, NULL), - -1); -- monitor = TRUE; -+ -+ if (g_str_equal (id, "grl-filesystem") == FALSE) -+ monitor = TRUE; - } - -- if (monitor && -- (ops & GRL_OP_NOTIFY_CHANGE) && -- g_str_equal (id, "grl-filesystem") == FALSE) { -+ if (monitor && (ops & GRL_OP_NOTIFY_CHANGE)) { - grl_source_notify_change_start (source, NULL); - g_signal_connect (G_OBJECT (source), "content-changed", - G_CALLBACK (content_changed_cb), self); --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0004-don-t-monitor-tracker.patch b/media-video/totem/files/totem-3.14.2-0004-don-t-monitor-tracker.patch deleted file mode 100644 index fb811bc..0000000 --- a/media-video/totem/files/totem-3.14.2-0004-don-t-monitor-tracker.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c56350fa481667837c4d2cb64d63217dea8a2b82 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Sun, 29 Mar 2015 15:22:53 +0200 -Subject: grilo: Don't monitor tracker - -See also: -https://bugzilla.gnome.org/show_bug.cgi?id=746974 - -diff --git a/src/totem-grilo.c b/src/totem-grilo.c -index 20580dd..733d9c9 100644 ---- a/src/totem-grilo.c -+++ b/src/totem-grilo.c -@@ -1282,7 +1282,8 @@ source_added_cb (GrlRegistry *registry, - if (source_is_recent (source)) { - browse (self, self->priv->recent_model, - NULL, source, NULL, -1); -- monitor = TRUE; -+ if (g_str_equal (id, "grl-tracker-source") == FALSE) -+ monitor = TRUE; - } else if (!source_is_browse_blacklisted (source)) { - const GdkPixbuf *icon; - --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch b/media-video/totem/files/totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch deleted file mode 100644 index 785c6b2..0000000 --- a/media-video/totem/files/totem-3.14.2-0005-fix-videos-icon-not-showing-in-volume-control.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c7fdff8eea6485373fb75f1402c6ce58bb0a1813 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 13 Mar 2015 10:02:29 +0100 -Subject: main: Fix Videos icon not showing in volume control - -Forcefully set PulseAudio icon property. Seems that PulseAudio's client -libraries aren't quite working things out in some cases. - -https://bugzilla.gnome.org/show_bug.cgi?id=745874 - -diff --git a/src/totem.c b/src/totem.c -index 2600921..3152ae0 100644 ---- a/src/totem.c -+++ b/src/totem.c -@@ -72,7 +72,7 @@ main (int argc, char **argv) - g_set_application_name (_("Videos")); - gtk_window_set_default_icon_name ("totem"); - g_setenv("PULSE_PROP_media.role", "video", TRUE); -- -+ g_setenv("PULSE_PROP_application.icon_name", "totem", TRUE); - - /* Build the main Totem object */ - totem = g_object_new (TOTEM_TYPE_OBJECT, --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0006-add-debug-statements.patch b/media-video/totem/files/totem-3.14.2-0006-add-debug-statements.patch deleted file mode 100644 index ce08a2d..0000000 --- a/media-video/totem/files/totem-3.14.2-0006-add-debug-statements.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dd2b351e5bdc31da2b047b5a009825209cf0d492 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 23 Apr 2015 17:19:31 +0200 -Subject: grilo: Add debug statements - -https://bugzilla.gnome.org/show_bug.cgi?id=746165 - -diff --git a/src/totem-grilo.c b/src/totem-grilo.c -index 733d9c9..a0c9027 100644 ---- a/src/totem-grilo.c -+++ b/src/totem-grilo.c -@@ -2487,6 +2487,8 @@ totem_grilo_finalize (GObject *object) - void - totem_grilo_start (TotemGrilo *self) - { -+ g_debug ("TotemGrilo: Resuming videos thumbnailing"); -+ - totem_grilo_resume_icon_thumbnailing (); - - if (self->priv->plugins_loaded) -@@ -2501,6 +2503,7 @@ totem_grilo_start (TotemGrilo *self) - void - totem_grilo_pause (TotemGrilo *self) - { -+ g_debug ("TotemGrilo: Pausing videos thumbnailing"); - totem_grilo_pause_icon_thumbnailing (); - } - --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch b/media-video/totem/files/totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch deleted file mode 100644 index f476007..0000000 --- a/media-video/totem/files/totem-3.14.2-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 295b6d0896177b0f3f778fb0fc1b0efd5595fde3 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 23 Apr 2015 17:21:44 +0200 -Subject: main: Fix thumbnailing starting when launching with a video - -We were previously relying on optionstate.filenames being non-NULL to -avoid starting thumbnailing when the user opened the player with a -video, but that actually caused doubly-adding those files passed on the -command-line, and didn't work when the Open() GApplication method was -used. - -Use a separate option to keep track of whether to start populating the -grilo icon view and thumbnailing, so that thumbnailing doesn't hamper -playback performance. - -https://bugzilla.gnome.org/show_bug.cgi?id=746165 - -diff --git a/src/totem-object.c b/src/totem-object.c -index 5ec8255..b9eb2f2 100644 ---- a/src/totem-object.c -+++ b/src/totem-object.c -@@ -145,6 +145,8 @@ totem_object_app_open (GApplication *application, - GSList *slist = NULL; - int i; - -+ optionstate.had_filenames = (n_files > 0); -+ - g_application_activate (application); - - totem_object_set_main_page (TOTEM_OBJECT (application), "player"); -@@ -237,21 +239,23 @@ totem_object_app_activate (GApplication *app) - * it comes from a plugin */ - totem_object_plugins_init (totem); - -- if (optionstate.filenames == NULL) { -- totem_object_set_main_page (totem, "grilo"); -- if (totem_session_try_restore (totem) == FALSE) -+ /* We're only supposed to be called from totem_object_app_handle_local_options() -+ * and totem_object_app_open() */ -+ g_assert (optionstate.filenames == NULL); -+ -+ if (!optionstate.had_filenames) { -+ if (totem_session_try_restore (totem) == FALSE) { -+ totem_object_set_main_page (totem, "grilo"); - totem_object_set_mrl (totem, NULL, NULL); -+ } else { -+ totem_object_set_main_page (totem, "player"); -+ } - } else { - totem_object_set_main_page (totem, "player"); -- if (totem_object_open_files (totem, optionstate.filenames)) -- totem_object_play_pause (totem); -- else -- totem_object_set_mrl (totem, NULL, NULL); -- -- g_strfreev (optionstate.filenames); -- optionstate.filenames = NULL; - } - -+ optionstate.had_filenames = FALSE; -+ - /* Set the logo at the last minute so we won't try to show it before a video */ - bacon_video_widget_set_logo (totem->bvw, "totem"); - -diff --git a/src/totem-options.c b/src/totem-options.c -index daba578..06b4f7c 100644 ---- a/src/totem-options.c -+++ b/src/totem-options.c -@@ -106,6 +106,7 @@ totem_options_process_for_server (Totem *totem, - - filenames = options->filenames; - options->filenames = NULL; -+ options->had_filenames = (filenames != NULL); - - /* Send the files to enqueue */ - for (i = 0; filenames && filenames[i] != NULL; i++) { -diff --git a/src/totem-options.h b/src/totem-options.h -index 662b775..f388706 100644 ---- a/src/totem-options.h -+++ b/src/totem-options.h -@@ -48,6 +48,7 @@ typedef struct { - gboolean replace; - gint64 seek; - gchar **filenames; -+ gboolean had_filenames; - } TotemCmdLineOptions; - - extern const GOptionEntry all_options[]; --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch b/media-video/totem/files/totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch deleted file mode 100644 index e18c488..0000000 --- a/media-video/totem/files/totem-3.14.2-0008-make-thumbnail-reading-cancellable.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fa130c465423038db5636aa5cb977e90f0794ac8 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 24 Apr 2015 15:58:23 +0200 -Subject: grilo: Make thumbnail reading cancellable - -https://bugzilla.gnome.org/show_bug.cgi?id=748370 - -diff --git a/src/icon-helpers.c b/src/icon-helpers.c -index 08d556a..feb15b3 100644 ---- a/src/icon-helpers.c -+++ b/src/icon-helpers.c -@@ -296,7 +296,7 @@ totem_grilo_get_thumbnail (GObject *object, - - file = g_file_new_for_uri (url_thumb); - g_task_set_task_data (task, file, g_object_unref); -- g_file_read_async (file, G_PRIORITY_DEFAULT, NULL, -+ g_file_read_async (file, G_PRIORITY_DEFAULT, cancellable, - get_stream_thumbnail_cb, task); - } - --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch b/media-video/totem/files/totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch deleted file mode 100644 index 3ef3e13..0000000 --- a/media-video/totem/files/totem-3.14.2-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ee959d9d4611c820218b6f015734a7e4f86aedfd Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 24 Apr 2015 17:17:36 +0200 -Subject: grilo: Limit ourselves to running one thumbnailer at a time - -Our thumbnailer currently doesn't have support for using hardware -decoding, so it's pretty CPU intensive. On my machine (i7 laptop with an -SSD), one thumbnailer would take about 40% of CPU. This causes both lag -when navigating the videos list, and carries on hampering video playback -if thumbnailing is started before playback. - -This is good enough to mark this bug as fixed: -https://bugzilla.gnome.org/show_bug.cgi?id=748370 - -though a better solution would be to cancel thumbnailing in -totem_grilo_pause(), make sure that -gnome_desktop_thumbnail_path_for_uri() is cancellable, and try to -distinguish in totem-grilo.c between cancellation because the player is -getting shut down, and cancellation because we want all the resources to -go to the player. - -diff --git a/src/icon-helpers.c b/src/icon-helpers.c -index feb15b3..f073f26 100644 ---- a/src/icon-helpers.c -+++ b/src/icon-helpers.c -@@ -30,7 +30,7 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API 1 - #include - --#define DEFAULT_MAX_THREADS 5 -+#define DEFAULT_MAX_THREADS 1 - #define THUMB_SEARCH_SIZE 256 - #define THUMB_SEARCH_HEIGHT (THUMB_SEARCH_SIZE / 4 * 3) - --- -cgit v0.10.2 - diff --git a/media-video/totem/files/totem-3.14.2-0010-fix-detection-of-valac.patch b/media-video/totem/files/totem-3.14.2-0010-fix-detection-of-valac.patch deleted file mode 100644 index 075c98b..0000000 --- a/media-video/totem/files/totem-3.14.2-0010-fix-detection-of-valac.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 404cfda65a5b444bad4fe0fd6dbf73da8ec36d88 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 27 Apr 2015 13:32:58 +0200 -Subject: build: Fix detection of valac -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -AM_PROG_VALAC very helpfully sets $VALAC to: -"Absolute path to the Vala compiler, or simply ‘valac’ if no suitable -compiler Vala could be found at configure runtime." - -We were checking for $VALAC being empty, thus still trying to build Vala -plugins even if Vala wasn't available. - -diff --git a/configure.ac b/configure.ac -index 20ec003..47718b0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -263,7 +263,7 @@ AC_ARG_ENABLE([vala], - AC_MSG_RESULT([$enable_vala]) - if test "x$enable_vala" != "xno"; then - AM_PROG_VALAC([$VALA_REQS]) -- if test "x$VALAC" = "x"; then -+ if test "$VALAC" = "valac"; then - if test "x$enable_vala" = "xyes"; then - AC_MSG_ERROR([Vala plugin support explicitly requested, but not found]) - fi --- -cgit v0.10.2 - diff --git a/media-video/totem/totem-3.14.2-r1.ebuild b/media-video/totem/totem-3.14.2-r1.ebuild deleted file mode 100644 index 0630569..0000000 --- a/media-video/totem/totem-3.14.2-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.14.2.ebuild,v 1.5 2015/03/15 13:29:45 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit autotools eutils gnome2 multilib python-single-r1 - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Videos" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+introspection lirc nautilus +python test zeitgeist" -# see bug #359379 -REQUIRED_USE=" - python? ( introspection ${PYTHON_REQUIRED_USE} ) - zeitgeist? ( introspection ) -" - -KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd" - -# TODO: -# Cone (VLC) plugin needs someone with the right setup to test it -# -# FIXME: -# Automagic tracker-0.9.0 -# Runtime dependency on gnome-session-2.91 -RDEPEND=" - >=dev-libs/glib-2.35:2 - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.11.5:3[introspection?] - >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] - >=dev-libs/libpeas-1.1.0[gtk] - x11-libs/cairo - >=dev-libs/libxml2-2.6:2 - >=media-libs/clutter-1.17.3:1.0[gtk] - >=media-libs/clutter-gst-1.5.5:2.0 - >=media-libs/clutter-gtk-1.5.5:1.0 - x11-libs/mx:1.0 - - >=media-libs/grilo-0.2.11:0.2[playlist] - media-plugins/grilo-plugins:0.2 - >=media-libs/gstreamer-1.3.1:1.0 - >=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango] - media-libs/gst-plugins-good:1.0 - media-plugins/gst-plugins-taglib:1.0 - media-plugins/gst-plugins-meta:1.0 - - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libXxf86vm-1.0.1 - - gnome-base/gnome-desktop:3 - gnome-base/gsettings-desktop-schemas - x11-themes/gnome-icon-theme-symbolic - - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) - lirc? ( app-misc/lirc ) - nautilus? ( >=gnome-base/nautilus-2.91.3 ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}] - >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - >=x11-libs/gtk+-3.5.2:3[introspection] ) - zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.5 - app-text/scrollkeeper - app-text/yelp-tools - dev-libs/appstream-glib - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40 - sys-devel/gettext - x11-proto/xextproto - x11-proto/xproto - virtual/pkgconfig - - dev-libs/gobject-introspection-common - gnome-base/gnome-common -" -# eautoreconf needs: -# app-text/yelp-tools -# dev-libs/gobject-introspection-common -# gnome-base/gnome-common -# docbook-xml-dtd is needed for user doc -# Prevent dev-python/pylint dep, bug #482538 - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Prevent pylint usage by tests, bug #482538 - sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die - - epatch "${FILESDIR}/${P}-0001-bump-required-grilo-version.patch" - epatch "${FILESDIR}/${P}-0002-fix-doubling-files-added-on-the-cmd-line.patch" - epatch "${FILESDIR}/${P}-0003-simplify-test-whether-to-monitor-a-source.patch" - epatch "${FILESDIR}/${P}-0004-don-t-monitor-tracker.patch" - epatch "${FILESDIR}/${P}-0005-fix-videos-icon-not-showing-in-volume-control.patch" - epatch "${FILESDIR}/${P}-0006-add-debug-statements.patch" - epatch "${FILESDIR}/${P}-0007-fix-thumbnailing-starting-when-launching-with-a-video.patch" - epatch "${FILESDIR}/${P}-0008-make-thumbnail-reading-cancellable.patch" - epatch "${FILESDIR}/${P}-0009-limit-ourselves-to-running-one-thumbnailer-at-a-time.patch" - epatch "${FILESDIR}/${P}-0010-fix-detection-of-valac.patch" - - eautoreconf - gnome2_src_prepare - - # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co. - # gst-inspect causes sandbox violations when a plugin needs write access to - # /dev/dri/card* in its init phase. - sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \ - -i configure || die -} - -src_configure() { - # Disabled: sample-python, sample-vala - local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder" - plugins+=",chapters,im-status,gromit,media-player-keys,ontop" - plugins+=",properties,recent,rotation,screensaver,screenshot" - plugins+=",skipto,vimeo" - use lirc && plugins+=",lirc" - use nautilus && plugins+=",save-file" - use python && plugins+=",dbusservice,pythonconsole,opensubtitles" - use zeitgeist && plugins+=",zeitgeist-dp" - - # pylint is checked unconditionally, but is only used for make check - gnome2_src_configure \ - --disable-run-in-source-tree \ - --disable-static \ - --enable-easy-codec-installation \ - --enable-vala \ - $(use_enable introspection) \ - $(use_enable nautilus) \ - $(use_enable python) \ - PYLINT=$(type -P true) \ - VALAC=$(type -P true) \ - --with-plugins=${plugins} -} diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest index 95d5cbd..8bc9bdb 100644 --- a/x11-misc/cairo-dock/Manifest +++ b/x11-misc/cairo-dock/Manifest @@ -1,4 +1,2 @@ -DIST cairo-dock-3.3.2.tar.gz 2592341 SHA256 a2d3854771d7ef5b262593b37aed216ece7eeacfc3e2a08deb4a797f175f6af8 SHA512 0850011ffb84ba611b89330ae0ea9915aa79691fdc809d0282994024e9fcb7c29967300fa93b93d642dea20cc6f077577c40e11aca5c0d8d7e4f9d7994a4a447 WHIRLPOOL da4a0bf96a28520f5188fe36fba5079fe9c41676ab8ab82554f1607bc9d7d99580226a2942ef0f378faa8dd9704777a05b3d52515da6cb26530c3c2bb7c5d750 DIST cairo-dock-3.4.0.tar.gz 2662360 SHA256 7843390bddce79497343e8bd3b8fbe528b7c6a65968d31595fd62ee12e284270 SHA512 a7ba6d7b8e3ecc888fceb235a378fdb7185dc07f04566d69f8c6b21ca7c567ca4c3cd2550d10d7459750cf69617012d542b15756e447cadf50f73d4e5e3c3a1a WHIRLPOOL fda71dd6ff192639d85dd6874a094e821113e3e5d353d66670086f4259bcca10de73653bd51ebe900eba95507fc5eba810a51257f8dfb48c564fdcf3a4e1e13b -EBUILD cairo-dock-3.3.2.ebuild 1584 SHA256 3c401525288d35a4feb7f6182ccff923833fe45b549b85aace3843959f3851a5 SHA512 613eb75d8a9a97f0973da3bd34ce58850794c3021aac55980b2987ff84a72420ef3cac78725853b29ba258f89b766cb20479ecba05a40a1413813b76c1b92a2a WHIRLPOOL 40615edfcd1488f1555d6482c17796470dc87efa32d127f8b4059fa77393adeab53f5e0a7624f0c1fc9211b4295a9f0dcdc23d238c83e77c6254ec9720b01df6 EBUILD cairo-dock-3.4.0.ebuild 1552 SHA256 ad55a88f605c0cc2dc0c26039f3a7d4569d231947ca211c668baaa054c52b543 SHA512 00f8ca8b1402c3848a2339c7400e3864184f52124db2fd61a14be09af9b5d8e10fdc60e900cef4452624e02ca8749d4f2a9ae355907c0e8b84f843caf2e67775 WHIRLPOOL 6bd91955f66d24a4e3211b6351d437deccce6136d5ae4d8328f15126aff714a680265b90a96b753b6c47e288997fc8fda47d3b32d007385db5ebdc1eaf4df9db diff --git a/x11-misc/cairo-dock/cairo-dock-3.3.2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.3.2.ebuild deleted file mode 100644 index 347863c..0000000 --- a/x11-misc/cairo-dock/cairo-dock-3.3.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit cmake-utils eutils versionator - -MY_PN="${PN}-core" -MM_PV=$(get_version_component_range '1-2') - -DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock." -HOMEPAGE="http://www.glx-dock.org" -SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="crypt xcomposite gtk3" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libxml2:2 - gnome-base/librsvg:2 - net-misc/curl - sys-apps/dbus - x11-libs/cairo - x11-libs/pango - x11-libs/gtk+:2 - x11-libs/gtkglext - x11-libs/libXrender - gtk3? ( x11-libs/gtk+:3 ) - crypt? ( sys-libs/glibc ) - xcomposite? ( - x11-libs/libXcomposite - x11-libs/libXinerama - x11-libs/libXtst - ) -" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext -" - -pkg_postinst() { - elog "Additional plugins are available to extend the functionality" - elog "of Cairo-Dock. It is recommended to install at least" - elog "x11-pluings/cairo-dock-plugins." - elog - elog "Cairo-Dock is an app that draws on a RGBA GLX visual." - elog "Some users have noticed that if the dock is launched," - elog "severals qt4-based applications could crash, like skype or vlc." - elog "If you have this problem, add the following line into your bashrc :" - echo - elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'" - elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details." -} diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest index d98ebb3..0df8b41 100644 --- a/x11-plugins/cairo-dock-plugins/Manifest +++ b/x11-plugins/cairo-dock-plugins/Manifest @@ -1,6 +1,2 @@ -AUX cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch 4080 SHA256 064a74d95e8b4015702049b4b4304938a745ebc65286ecb1c954344b5b23a8a8 SHA512 13d92fb83acc5cd9b729448c9f9141f130b159daf0eb5a20ce9419a639e6c1912915e7955dec4de6280b1bb5c6db6cbe9b9e2a8551018451ae4431e273e631d0 WHIRLPOOL 997e22c65a8b583cacf1ba233cf7ec9ade0bfdafc5eabba7d3b8912ef2091338d9a4cc1fdc9e925df2e78fc8309b246d9492bdbee208afc0c68d5192a610c763 -AUX cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch 6777 SHA256 8475e0a5e3e961d657df9b9a33ad0e5571eacdc88895f926928b96bb03973a78 SHA512 dd10052cace8e1d7aae65e65c12815490c97a2cca86e609fd269632f0a2a4e0a07d3d91a7a70a46cb9616b06e7322960da6ebd030a826b9a4a60f65eee2814ad WHIRLPOOL 3ad8db32c93493d5998d13d47ca9cae4bc88a6ba4ddff2de999aa15359bbd5f7b88812c7ceb0e4e6dc54f9a2763d1b06e9ffac34febe02009db3c26964628e2b -DIST cairo-dock-plugins-3.3.2.tar.gz 6838900 SHA256 48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643 SHA512 ccf38032261668cd5012d5a521c42ed7279b7f0f33c1b52cfbb90d66927f9c3487eada29057349206b051f979fdbd9b3c83319647ce721712333ca1c3284bf9f WHIRLPOOL 2a7f7f1040766d2953740459c8ddbbf2173470c4fa5b77ba350605d448bc999e9268f695b9657e4608f7152eb9de829920253e4645338e9a3966948b395be9d5 DIST cairo-dock-plugins-3.4.0.tar.gz 6819610 SHA256 7ffcf40f07cd05bef826ad47f1f11940b9813d279c9e5117384f14f1f32d8dbd SHA512 4e0de372719385e559735238ce944adbb7d6c0c734fde18a5d19e95c3ddef59131848a6d0b1b535faadd3629a48ae47ce032124b348af99106d238f5add2e3eb WHIRLPOOL d0b44be61a2e412ddb7e24f547e29115bf46fb1ab9c10cccf2bf76f9699f322cb5272a588edbb83449e5effd7833c0d2117ab241df4457ebca51d3b51e8b12b0 -EBUILD cairo-dock-plugins-3.3.2.ebuild 1769 SHA256 c56e94e35fe4e6fe8dfef0af36df6c363d1b2c6b6a32fe6b245cbfe92fb06dea SHA512 864ac7740d69e9eb42188f4af5c8f758ca677b89a7e21b4b0a9c55cadf6c435b7f63ad9be6825a48379e8c3d3e30f590143fb09e0e74ec6d3d5f670dcb83fe7e WHIRLPOOL 56eaedf4bcd4dfd36ee842e11389348208b28458fc04a4bc1c2a23d08ec7f3ed608c242b19c4ac79890ba9f8880fb23e2fa84e657275c0a27cd6b4da6b3d737e EBUILD cairo-dock-plugins-3.4.0.ebuild 1556 SHA256 b4ccfe2f0f8351ca691fc0c7e0ffebae1f65bdcd501ab7bc19b83e01f1cb37d8 SHA512 86ca9cd2353593f3e9b792bc04633e0fa5a66fd011bfd0ac763d3e7bfe2f9852d8377031b8b288206c82122887c7c64f7af9bacb594ecfe625bc41f630de52f7 WHIRLPOOL 8278e1fd3284637cc20b1f6abf569a350283bd623d6f91ed7fdbf82f464295ccdaf011d41e28b46de2c488a7d1f29fad94357023a6d74b68d5c62d9caa27d27b diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild deleted file mode 100644 index e519575..0000000 --- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -inherit cmake-utils eutils versionator - -MY_PN="${PN/plugins/plug-ins}" -MM_PV=$(get_version_component_range '1-2') - -DESCRIPTION="Official plugins for cairo-dock" -HOMEPAGE="http://www.glx-dock.org" -SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa exif gmenu gtk3 kde terminal gnote vala webkit xfce xgamma xklavier twitter indicator3 zeitgeist mail upower" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libxml2 - gnome-base/librsvg:2 - sys-apps/dbus - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/gtkglext - ~x11-misc/cairo-dock-${PV} - gtk3? ( x11-libs/gtk+:3 ) - alsa? ( media-libs/alsa-lib ) - exif? ( media-libs/libexif ) - gmenu? ( gnome-base/gnome-menus ) - kde? ( kde-base/kdelibs ) - terminal? ( x11-libs/vte ) - vala? ( dev-lang/vala:0.12 ) - webkit? ( >=net-libs/webkit-gtk-1.0 ) - xfce? ( xfce-base/thunar ) - xgamma? ( x11-libs/libXxf86vm ) - xklavier? ( x11-libs/libxklavier ) - gnote? ( app-misc/gnote ) - twitter? ( dev-python/oauth dev-python/simplejson ) - indicator3? ( dev-libs/libindicator ) - zeitgeist? ( dev-libs/libzeitgeist ) - mail? ( net-libs/libetpan ) - upower? ( sys-power/upower ) -" - -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - dev-libs/libdbusmenu:3[gtk] -" - -src_prepare() { - # Patch to disable features with upower > 0.99 - epatch "${FILESDIR}/${P}-upower-099-r3083-modified.patch" - epatch "${FILESDIR}/${P}-upower-099-r3084-modified.patch" -} - -src_configure() { - mycmakeargs=( - $(use upower && echo "-Denable-upower-support=ON" || echo "-Denable-upower-support=OFF") - ) - cmake-utils_src_configure -} diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch deleted file mode 100644 index 1ec08e3..0000000 --- a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- cairo-dock-plugins-3.3.2/CMakeLists.txt.upower0 2013-10-29 19:27:30.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/CMakeLists.txt 2014-06-16 14:00:42.543802818 +0900 -@@ -152,6 +152,14 @@ - set (shared_filesdatadir "${pluginsdatadir}/shared-files") - add_subdirectory (shared-files) - -+ -+ -+################################################################################ -+# STATIC LIBS AND DEPENDENCES USED BY MORE THAN ONE PLUG-IN # -+################################################################################ -+ -+ -+ - ############# STATIC LIBRARIES ################ - message (STATUS "> Static Libraries:") - -@@ -337,6 +345,29 @@ - endif() - endif() - -+############# UPOWER ##################### -+message (STATUS "> UPower:") -+enable_if_not_defined (enable-upower-support) -+if (enable-upower-support) -+ pkg_check_modules (UPOWER upower-glib) # useful for Powermanager too. -+endif() -+if (UPOWER_FOUND) -+ set (with_upower_support yes) -+ STRING (REGEX REPLACE "\\..*" "" UPOWER_MAJOR "${UPOWER_VERSION}") # 2.28.3 => 2 -+ STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" UPOWER_MINOR "${UPOWER_VERSION}") # 2.28.3 => 2.28 -+ STRING (REGEX REPLACE "\\.[0-9]*" "" UPOWER_MINOR "${UPOWER_MINOR}") # 2.28 => 28 -+ if (${UPOWER_MAJOR} GREATER 0 OR ${UPOWER_MINOR} GREATER 89) -+ message (STATUS " Your version of UPower no longer supports logout features") -+ else() -+ set (UPOWER_SUPPORTS_LOGOUT 1) -+ endif() -+else() -+ set (with_upower_support no) -+ message (STATUS "Could not find upower-glib; Logout and PowerManager plugin won't be built with UPower support.") -+ message (WARNING "This module is required to compile LogOut and PowerManager applet with UPower support: upower-glib") -+ set (MODULES_MISSING "${MODULES_MISSING} upower-glib") -+endif() -+ - ############# DISTRIBUTION ################# - message (STATUS "> Distribution:") - # We try to detect if the user is on Ubuntu to know which bus we have to use... -@@ -965,18 +996,6 @@ - - ############# LOGOUT ################# - message (STATUS "> Logout:") --enable_if_not_defined (enable-upower-support) --if (enable-upower-support) -- pkg_check_modules (UPOWER upower-glib) # useful for Powermanager too. --endif() --if (UPOWER_FOUND) -- set (with_upower_support yes) --else() -- set (with_upower_support no) -- message (STATUS "Could not find upower-glib; Logout and PowerManager plugin won't be built with UPower support.") -- message (WARNING "This module is required to compile LogOut and PowerManager applet with UPower support: upower-glib") -- set (MODULES_MISSING "${MODULES_MISSING} upower-glib") --endif() - set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS}) - set (VERSION_LOGOUT "2.0.3") - set (PACKAGE_LOGOUT "cd-logout") ---- cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt.upower0 2013-10-03 20:04:33.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt 2014-06-16 14:01:03.155216380 +0900 -@@ -20,22 +20,29 @@ - add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_LOGOUT}") - add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") - add_definitions (-DMY_APPLET_ICON_FILE="icon.svg") --if (${UPOWER_FOUND}) -- add_definitions (-DCD_UPOWER_AVAILABLE="1") --endif() - -+if (UPOWER_SUPPORTS_LOGOUT) -+ add_definitions (-DCD_UPOWER_AVAILABLE="1") -+ -+ include_directories ( -+ ${UPOWER_INCLUDE_DIRS} -+ ${PACKAGE_INCLUDE_DIRS}) -+ -+ link_directories ( -+ ${UPOWER_LIBRARY_DIRS} -+ ${PACKAGE_LIBRARY_DIRS}) -+ -+ target_link_libraries (${PACKAGE_LOGOUT} -+ ${UPOWER_LIBRARIES} -+ ${PACKAGE_LIBRARIES}) -+else() -+ include_directories (${PACKAGE_INCLUDE_DIRS}) - --include_directories ( -- ${UPOWER_INCLUDE_DIRS} -- ${PACKAGE_INCLUDE_DIRS}) -- --link_directories ( -- ${UPOWER_LIBRARY_DIRS} -- ${PACKAGE_LIBRARY_DIRS}) -- --target_link_libraries (${PACKAGE_LOGOUT} -- ${UPOWER_LIBRARIES} -- ${PACKAGE_LIBRARIES}) -+ link_directories (${PACKAGE_LIBRARY_DIRS}) -+ -+ target_link_libraries (${PACKAGE_LOGOUT} -+ ${PACKAGE_LIBRARIES}) -+endif() - - ########### install files ############### - diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch deleted file mode 100644 index 5263a59..0000000 --- a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- cairo-dock-plugins-3.3.2/CMakeLists.txt.upower1 2014-06-16 14:01:49.819680691 +0900 -+++ cairo-dock-plugins-3.3.2/CMakeLists.txt 2014-06-16 14:01:49.821680926 +0900 -@@ -357,9 +357,10 @@ - STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" UPOWER_MINOR "${UPOWER_VERSION}") # 2.28.3 => 2.28 - STRING (REGEX REPLACE "\\.[0-9]*" "" UPOWER_MINOR "${UPOWER_MINOR}") # 2.28 => 28 - if (${UPOWER_MAJOR} GREATER 0 OR ${UPOWER_MINOR} GREATER 89) -- message (STATUS " Your version of UPower no longer supports logout features") -+ message (STATUS " Your version of UPower no longer supports suspend/hibernate features") -+ set (with_upower_support "yes (0.99+)") - else() -- set (UPOWER_SUPPORTS_LOGOUT 1) -+ set (UPOWER_SUPPORTS_SUSPEND_HIBERNATE 1) - endif() - else() - set (with_upower_support no) ---- cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt.upower1 2014-06-16 14:01:49.822681043 +0900 -+++ cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt 2014-06-16 14:02:34.010855358 +0900 -@@ -21,7 +21,7 @@ - add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") - add_definitions (-DMY_APPLET_ICON_FILE="icon.svg") - --if (UPOWER_SUPPORTS_LOGOUT) -+if (UPOWER_SUPPORTS_SUSPEND_HIBERNATE) - add_definitions (-DCD_UPOWER_AVAILABLE="1") - - include_directories ( ---- cairo-dock-plugins-3.3.2/powermanager/src/CMakeLists.txt.upower1 2013-10-03 20:04:33.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/powermanager/src/CMakeLists.txt 2014-06-16 14:01:49.822681043 +0900 -@@ -25,7 +25,10 @@ - add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") - add_definitions (-DMY_APPLET_ICON_FILE="icon.png") - if (${UPOWER_FOUND}) -- add_definitions (-DCD_UPOWER_AVAILABLE="1") -+ add_definitions (-DCD_UPOWER_AVAILABLE=1) -+ if (NOT UPOWER_SUPPORTS_SUSPEND_HIBERNATE) -+ add_definitions (-DCD_UPOWER_0_99=1) -+ endif() - endif() - - include_directories ( ---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-menu-functions.c.upower1 2013-10-03 20:04:33.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-menu-functions.c 2014-06-16 14:01:49.822681043 +0900 -@@ -90,19 +90,5 @@ - - if (bAddSeparator) - CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); -- -- // Power actions (Hibernate/Suspend) -- #ifdef CD_UPOWER_AVAILABLE // if Upower is available, we should be able to suspend; if not, then it's probably just a problem with consolekit, which should be fixed by the user; so show the items to give the user a hint about the problem. -- pMenuItem = CD_APPLET_ADD_IN_MENU (D_("Hibernate"), cd_power_hibernate, CD_APPLET_MY_MENU); -- if (! cd_power_can_hibernate ()) -- gtk_widget_set_sensitive (pMenuItem, FALSE); -- pMenuItem = CD_APPLET_ADD_IN_MENU (D_("Suspend"), cd_power_suspend, CD_APPLET_MY_MENU); -- if (! cd_power_can_suspend ()) -- gtk_widget_set_sensitive (pMenuItem, FALSE); -- #else -- if (cd_power_can_hibernate ()) -- CD_APPLET_ADD_IN_MENU (D_("Hibernate"), cd_power_hibernate, CD_APPLET_MY_MENU); -- if (cd_power_can_suspend ()) -- CD_APPLET_ADD_IN_MENU (D_("Suspend"), cd_power_suspend, CD_APPLET_MY_MENU); -- #endif -+ - CD_APPLET_ON_BUILD_MENU_END ---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-struct.h.upower1 2013-10-03 20:04:33.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-struct.h 2014-06-16 14:01:49.823681160 +0900 -@@ -22,10 +22,6 @@ - - #include - #ifdef CD_UPOWER_AVAILABLE --/* to access suspend/resume functionality on Upower 0.9 -- * even if we use first logind, we only use logind via DBus -- */ --#define UPOWER_ENABLE_DEPRECATED - #include - #endif - ---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.c.upower1 2013-10-03 20:04:33.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.c 2014-06-16 14:01:49.823681160 +0900 -@@ -48,7 +48,11 @@ - UpClient *pUPowerClient = up_client_new (); - - // get the list of devices. -- if (pUPowerClient == NULL || ! up_client_enumerate_devices_sync (pUPowerClient, NULL, NULL)) -+ if (pUPowerClient == NULL -+ #ifndef CD_UPOWER_0_99 // no longer available with UPower 0.99+ -+ || ! up_client_enumerate_devices_sync (pUPowerClient, NULL, NULL) -+ #endif -+ ) - { - cd_warning ("couldn't get devices from UPower daemon"); - if (pUPowerClient) -@@ -182,6 +186,7 @@ - CD_APPLET_LEAVE (); - } - -+#ifndef CD_UPOWER_0_99 // no longer used with UPower 0.99+ - static void _on_device_changed (G_GNUC_UNUSED UpDevice *pDevice, G_GNUC_UNUSED gpointer data) - { - CD_APPLET_ENTER; -@@ -194,6 +199,7 @@ - update_icon (); - CD_APPLET_LEAVE (); - } -+#endif - - // Can be launched the first time (with the Task) or when a device is added/removed after. - static gboolean _cd_upower_update_state (CDSharedMemory *pSharedMemory) -@@ -248,6 +254,7 @@ - g_free (cVendor); - g_free (cModel); - -+ #ifndef CD_UPOWER_0_99 // no longer used with UPower 0.99+ - if (myData.pTask != NULL // only the first time - || myData.pBatteryDeviceList == NULL // or if it's a new device - || g_list_find (myData.pBatteryDeviceList, pDevice) == NULL) -@@ -262,6 +269,7 @@ - iSignalID = g_signal_connect (pDevice, "changed", G_CALLBACK (_on_device_changed), NULL); - myData.pSignalIDList = g_list_append (myData.pSignalIDList, GINT_TO_POINTER (iSignalID)); - } -+ #endif - - bFirst = FALSE; - } -@@ -364,38 +372,6 @@ - } - } - --gboolean cd_power_hibernate (void) --{ -- if (myData.pUPowerClient != NULL) -- return up_client_hibernate_sync (myData.pUPowerClient, NULL, NULL); -- else -- return FALSE; --} -- --gboolean cd_power_suspend (void) --{ -- if (myData.pUPowerClient != NULL) -- return up_client_suspend_sync (myData.pUPowerClient, NULL, NULL); -- else -- return FALSE; --} -- --gboolean cd_power_can_hibernate (void) --{ -- if (myData.pUPowerClient != NULL) -- return up_client_get_can_hibernate (myData.pUPowerClient); -- else -- return FALSE; --} -- --gboolean cd_power_can_suspend (void) --{ -- if (myData.pUPowerClient != NULL) -- return up_client_get_can_suspend (myData.pUPowerClient); -- else -- return FALSE; --} -- - #else // code without libupower - - void cd_powermanager_start (void) -@@ -408,24 +384,4 @@ - - } - --gboolean cd_power_hibernate (void) --{ -- return FALSE; --} -- --gboolean cd_power_suspend (void) --{ -- return FALSE; --} -- --gboolean cd_power_can_hibernate (void) --{ -- return FALSE; --} -- --gboolean cd_power_can_suspend (void) --{ -- return FALSE; --} -- - #endif ---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.h.upower1 2013-10-03 20:04:33.000000000 +0900 -+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.h 2014-06-16 14:01:49.823681160 +0900 -@@ -27,14 +27,4 @@ - - void cd_upower_stop (void); - -- --gboolean cd_power_hibernate (void); -- --gboolean cd_power_suspend (void); -- --gboolean cd_power_can_hibernate (void); -- --gboolean cd_power_can_suspend (void); -- -- - #endif diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 049c588..7624d06 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -1,8 +1,4 @@ AUX gnome-terminal-3.14-restore-transparency.patch 15730 SHA256 ae62bc139a40066d624cee13befd0a0a747fed5e3acfb98782ab7a31796f2510 SHA512 37204eadb61f64a5107203d54d65730ec859732cb71f09cfbb5cd60b25080025acc4e94d643fb55c3822bc7cede1a7759692e2ff672f80d0a4ab4d1e0f0f2cb7 WHIRLPOOL 059b38d79b6e89ed740f00d6759cf93fcb2864be09d2b1644a2e8a9d7e2f9461adad4e4f20ade5a94342b032e102c2e31c236e863f287f063b4cb0d4c3429e39 -AUX gnome-terminal-3.14.2-fix-crash.patch 832 SHA256 19dbb2ac1cd5ce46106570678cd65dc3a76e3fdbcad87d22bfa12d4612075bc2 SHA512 649c9da52650b9d6a59989fd5dfcf763dac0a37b695c593539d3e483f8c986ca17da33647fc3dc83513b38a254c5202af7f4fca073129074c0e4f029e4c9f7ec WHIRLPOOL 59d517ef092463738490105a4953d0cabb3ebac4cd3d8f9895d1f6753996ad14c916a8e46b097d9a09f7a4021465029cf470ea64d3e81d3285670bdc190bc932 -AUX gnome-terminal-3.14.2-title-option.patch 6329 SHA256 0ea6adbf45632b42942f15f58666414ff65c9e9fc85a0293b6cba9d4909c2fd4 SHA512 cbc641c6c3e822e29db2d5b18f979d942f59de279e2453c800ee043eedbc68f4682ca6d53428a2394ef650ac654e5077641fa19b68cd841fb3c68d273198b3f2 WHIRLPOOL e4a415a1d4b0d26f6804f1410952eb55e064bc38981c716b8f55ef54e13890ebfad6501f2fe4a163b0654d02b5d56045267c5093569ea2a3aa6d8d86bb1e321a -DIST gnome-terminal-3.14.2.tar.xz 1784996 SHA256 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b SHA512 43a81d9f4ff43dd4ffcd023755f765a20ec2d2f922d58bee230386d97d38712dbb8b41d7da62143689fb9ed0d0e5500e849de743ec033494231a804e02969cd9 WHIRLPOOL 1ce5eafb8bd8baa2658413aa9acfcef96bbd2f587052233573d3e540d9389c348d9e94d976be5cffa8c739dd915a4359576bc5cfb2d687db21e362f53794ec6f DIST gnome-terminal-3.14.3.tar.xz 1781712 SHA256 db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3 SHA512 21e1292391d77a658b01be12ca7f2f5a8f2f504ef9c57c587dc699e455fc4e052e65c90111ffd7ceb8c23422b60d75a0dffca699e57a2af245277e25f38f0655 WHIRLPOOL db3870d34d5bffce3493af3c1eff479633553b570d9c462bbe7ed4a5bb2305011b45a912331d5d9649d68918a6c9fd80c11bd5d9fb8599a66437a5fd2105089c -EBUILD gnome-terminal-3.14.2-r2.ebuild 2262 SHA256 79c015c131bb983d845046ee57b2dbb14789326db606db47f0bf76d11a45a803 SHA512 fcce249b7564aa55f16cb11d666e1f4d110efb966e880b57bce7789934940283b1c6acc26612cc0aea9cfef0bf0edc7f9443e97dd8e9fa34713f1792e4f4ab2b WHIRLPOOL b3251d097e780a2481cc180837fb7ebb079cb1624255bad93d96e06e2ba777812c113564b02fc8bbbbe3b5724fe9414e53501bf599ec1e09dccdea5474955100 -EBUILD gnome-terminal-3.14.3.ebuild 1964 SHA256 0b1ebc20db90de1a008d1c5abbcd26f3321e947276896e177c40283b2bcc82fb SHA512 502224b0708b31db7276a3557cb656a555a981d8fc9742691b190d41e3a0278ccda204f9999c084385efc91faf8efbc67852229301efb4bbe6b457e71ddba76d WHIRLPOOL 19549fe76ce8b36a118f7ec74d687f22cada18a0928e9a48e4327b449ccb13c3bad80fb40d89b26b901077ce61af2a9e0ba9ddc8fb63b5a9d478d0497ecef132 +EBUILD gnome-terminal-3.14.3.ebuild 1844 SHA256 3d2ebe879821e85f173da3816adf7e34a74d0372ec63bb4bed26d34edc41fcdd SHA512 074d4c90c4cad26d49deda30f1c7becb9a66cf3f646b902402e571d22a5fc38e1ed47c2194a3dfd3d26507a66f865344ef536806a6e747aac9baff1f428de6f3 WHIRLPOOL ef4901ec2bdef591f5ea473758e2d825f88f789a2a92d4598584563b0c1ca2bbbe93ae1e33ac97fafafff576a8a89e4709f64409efe63ad2649d77e67a4830d5 MISC metadata.xml 326 SHA256 181cdd492d55b5179008e3a36c4b3bc0cdd8ab896e0e54bbbf9e98d7a3362da3 SHA512 f66ce7d9b1e6282bb6922c92c6f09ee343961ad5ce9d52db46c587f5b2c66088797529264b13ff5d6a5fdc7f30e9989ac37101e6b881fef085f571c9b249fc0b WHIRLPOOL b0324d62b86672f0f785279e02f10207fd254b17b71b927a6c86ef1b31ecf9c0fb4144dc45c541dc5e70600164674c52b14bcd09536bb7294cd7b896382081e5 diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch deleted file mode 100644 index 40ddbc0..0000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-fix-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 664f1e9e8b224658c3f01a062517ad386129d953 Mon Sep 17 00:00:00 2001 -From: Egmont Koblinger -Date: Thu, 8 Jan 2015 14:33:13 +0100 -Subject: screen: Fix crash with empty child process command line - -https://bugzilla.gnome.org/show_bug.cgi?id=742560 -(cherry picked from commit 1c7ed77b003f14bb94527c8fe548c6c414c0da9e) - -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index ad78388..9f63239 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -1904,7 +1904,9 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, - if (process_name) - gs_transfer_out_value (process_name, &name); - -- for (i = 0; i < len - 1; i++) -+ if (len > 0 && data[len - 1] == '\0') -+ len--; -+ for (i = 0; i < len; i++) - { - if (data[i] == '\0') - data[i] = ' '; --- -cgit v0.10.1 - diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch deleted file mode 100644 index 1e3ddd3..0000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.14.2-title-option.patch +++ /dev/null @@ -1,166 +0,0 @@ -From c730504aa3893978cdb667d7fcf1357d2951841e Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Sat, 15 Nov 2014 21:11:08 +0100 -Subject: client: Hide obsolete --title option - -Accept it for compatibility, but ignore it. - -https://bugzilla.gnome.org/show_bug.cgi?id=740188 -(cherry picked from commit 0033eca2909ddccf3358c1f089bce05d3473b123) - -diff --git a/src/gterminal.vala b/src/gterminal.vala -index cf1ffae..7e55678 100644 ---- a/src/gterminal.vala -+++ b/src/gterminal.vala -@@ -233,7 +233,6 @@ namespace GTerminal - - public static string? working_directory = null; - public static string? profile = null; -- public static string? title = null; - public static double zoom = 1.0; - - private static bool option_profile (string option_name, -@@ -269,8 +268,6 @@ namespace GTerminal - { "profile", 0, 0, OptionArg.CALLBACK, (void*) option_profile, - N_("Use the given profile instead of the default profile"), - N_("UUID") }, -- { "title", 0, 0, OptionArg.STRING, ref title, -- N_("Set the terminal title"), N_("TITLE") }, - { "cwd", 0, 0, OptionArg.FILENAME, ref working_directory, - N_("Set the working directory"), N_("DIRNAME") }, - { "zoom", 0, 0, OptionArg.CALLBACK, (void*) option_zoom, -@@ -418,7 +415,7 @@ namespace GTerminal - OpenOptions.geometry, - OpenOptions.role, - OpenOptions.profile, -- OpenOptions.title, -+ null /* title */, - OpenOptions.maximise, - OpenOptions.fullscreen); - if (OpenOptions.show_menubar_set) -diff --git a/src/terminal-options.c b/src/terminal-options.c -index 75fc64d..0280f11 100644 ---- a/src/terminal-options.c -+++ b/src/terminal-options.c -@@ -96,7 +96,6 @@ initial_tab_new (char *profile /* adopts */) - - it->profile = profile; - it->exec_argv = NULL; -- it->title = NULL; - it->working_dir = NULL; - it->zoom = 1.0; - it->zoom_set = FALSE; -@@ -110,7 +109,6 @@ initial_tab_free (InitialTab *it) - { - g_free (it->profile); - g_strfreev (it->exec_argv); -- g_free (it->title); - g_free (it->working_dir); - g_slice_free (InitialTab, it); - } -@@ -596,30 +594,6 @@ option_load_config_cb (const gchar *option_name, - } - - static gboolean --option_title_callback (const gchar *option_name, -- const gchar *value, -- gpointer data, -- GError **error) --{ -- TerminalOptions *options = data; -- -- if (options->initial_windows) -- { -- InitialTab *it = ensure_top_tab (options); -- -- g_free (it->title); -- it->title = g_strdup (value); -- } -- else -- { -- g_free (options->default_title); -- options->default_title = g_strdup (value); -- } -- -- return TRUE; --} -- --static gboolean - option_working_directory_callback (const gchar *option_name, - const gchar *value, - gpointer data, -@@ -789,7 +763,6 @@ terminal_options_parse (const char *working_directory, - options->initial_windows = NULL; - options->default_role = NULL; - options->default_geometry = NULL; -- options->default_title = NULL; - options->zoom = 1.0; - options->zoom_set = FALSE; - -@@ -928,7 +901,6 @@ terminal_options_merge_config (TerminalOptions *options, - /* it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL); - it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/ - it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL); -- it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL); - - if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) && - !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error))) -@@ -985,7 +957,6 @@ terminal_options_free (TerminalOptions *options) - g_free (options->default_role); - g_free (options->default_geometry); - g_free (options->default_working_dir); -- g_free (options->default_title); - g_free (options->default_profile); - - g_strfreev (options->exec_argv); -@@ -1156,11 +1127,10 @@ get_goption_context (TerminalOptions *options) - { - "title", - 't', -- 0, -+ G_OPTION_FLAG_HIDDEN, - G_OPTION_ARG_CALLBACK, -- option_title_callback, -- N_("Set the terminal title"), -- N_("TITLE") -+ unsupported_option_callback, -+ NULL, NULL - }, - { - "working-directory", -diff --git a/src/terminal-options.h b/src/terminal-options.h -index a1e645b..17f42b4 100644 ---- a/src/terminal-options.h -+++ b/src/terminal-options.h -@@ -75,7 +75,6 @@ typedef struct - char *default_role; - char *default_geometry; - char *default_working_dir; -- char *default_title; - char **exec_argv; - char *default_profile; - gboolean default_profile_is_id; -@@ -95,7 +94,6 @@ typedef struct - char *profile; - gboolean profile_is_id; - char **exec_argv; -- char *title; - char *working_dir; - double zoom; - guint zoom_set : 1; -diff --git a/src/terminal.c b/src/terminal.c -index 2dd5a6d..b6a6f5e 100644 ---- a/src/terminal.c -+++ b/src/terminal.c -@@ -102,7 +102,7 @@ handle_options (TerminalFactory *factory, - iw->geometry, - iw->role, - it->profile ? it->profile : options->default_profile, -- it->title ? it->title : options->default_title, -+ NULL /* title */, - iw->start_maximized, - iw->start_fullscreen); - --- -cgit v0.10.1 - diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild deleted file mode 100644 index ab6bf6e..0000000 --- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.4 2015/05/19 14:10:09 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 readme.gentoo - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="debug +gnome-shell +nautilus" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: automagic dependency on gtk+[X] -RDEPEND=" - >=dev-libs/glib-2.40:2[dbus] - >=x11-libs/gtk+-3.10:3[X] - >=x11-libs/vte-0.38:2.91 - >=gnome-base/dconf-0.14 - >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/util-linux - x11-libs/libSM - x11-libs/libICE - gnome-shell? ( gnome-base/gnome-shell ) - nautilus? ( >=gnome-base/nautilus-3 ) -" -# gtk+:2 needed for gtk-builder-convert, bug 356239 -# itstool required for help/* with non-en LINGUAS, see bug #549358 -# xmllint required for glib-compile-resources, see bug #549304 -DEPEND="${RDEPEND} - app-text/yelp-tools - dev-libs/libxml2 - dev-util/appdata-tools - dev-util/gdbus-codegen - || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) - dev-util/itstool - >=dev-util/intltool-0.50 - sys-devel/gettext - virtual/pkgconfig -" - -DOC_CONTENTS="To get previous working directory inherited in new opened - tab you will need to add the following line to your ~/.bashrc:\n - . /etc/profile.d/vte.sh" - -src_prepare() { - # client: Hide obsolete --title option (from '3.14') - epatch "${FILESDIR}/${P}-title-option.patch" - - # screen: Fix crash with empty child process command line (from '3.14') - epatch "${FILESDIR}/${P}-fix-crash.patch" - epatch "${FILESDIR}/${PN}-3.14-restore-transparency.patch" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --disable-migration \ - $(use_enable debug) \ - $(use_enable gnome-shell search-provider) \ - $(use_with nautilus nautilus-extension) \ - VALAC=$(type -P true) -} - -src_install() { - DOCS="AUTHORS ChangeLog HACKING NEWS" - gnome2_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild index 4d63c6c..363fb88 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 1.2 2015/05/19 14:10:09 tetromino Exp $ +# $Header: $ EAPI="5" GCONF_DEBUG="no" @@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" LICENSE="GPL-3+" SLOT="0" IUSE="debug +gnome-shell +nautilus" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" # FIXME: automagic dependency on gtk+[X] RDEPEND="