summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-admin/conky/conky-1.10.0.ebuild2
-rw-r--r--app-portage/g-sorcery/g-sorcery-0.2.1.ebuild2
-rw-r--r--app-portage/g-sorcery/g-sorcery-0.2.ebuild2
-rw-r--r--media-tv/xawtv/files/xawtv-3.95-stdbool.patch10
-rw-r--r--media-tv/xawtv/xawtv-3.95-r3.ebuild1
-rw-r--r--media-video/cinelerra/cinelerra-20140710.ebuild4
-rw-r--r--media-video/cinelerra/files/cinelerra-asm-gcc52.patch15
-rw-r--r--media-video/cinelerra/files/cinelerra-putbits-gcc52.patch29
-rw-r--r--net-misc/redir/metadata.xml6
-rw-r--r--profiles/arch/arm/package.use.mask6
10 files changed, 70 insertions, 7 deletions
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild
index e38426c08d84..5994fb84140f 100644
--- a/app-admin/conky/conky-1.10.0.ebuild
+++ b/app-admin/conky/conky-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
index 125480df278c..55e590956029 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
IUSE="bson git"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
git? ( dev-vcs/git )
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.ebuild
index 7228ddd53515..5089c732d1ac 100644
--- a/app-portage/g-sorcery/g-sorcery-0.2.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
IUSE="bson"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
new file mode 100644
index 000000000000..b93bb11c8644
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
@@ -0,0 +1,10 @@
+--- x11/blit.c
++++ x11/blit.c
+@@ -13,6 +13,7 @@
+ #include <pthread.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
++#include <stdbool.h>
+
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild
index 451a9d10fe2b..429f21fa1914 100644
--- a/media-tv/xawtv/xawtv-3.95-r3.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-r3.ebuild
@@ -76,6 +76,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
epatch "${FILESDIR}/${P}-pagemask-fix.patch"
epatch "${FILESDIR}/${P}-jpeg-7.patch"
+ epatch "${FILESDIR}/${P}-stdbool.patch"
eautoreconf
}
diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild
index 0866be2373e3..48f96efcf20e 100644
--- a/media-video/cinelerra/cinelerra-20140710.ebuild
+++ b/media-video/cinelerra/cinelerra-20140710.ebuild
@@ -62,7 +62,9 @@ src_prepare() {
"${FILESDIR}"/${P}-ffmpeg-0.11.patch \
"${FILESDIR}"/${PN}-libav9.patch \
"${FILESDIR}"/${PN}-pngtoh.patch \
- "${FILESDIR}"/${PN}-nofindobject.patch
+ "${FILESDIR}"/${PN}-nofindobject.patch \
+ "${FILESDIR}"/${PN}-asm-gcc52.patch \
+ "${FILESDIR}"/${PN}-putbits-gcc52.patch
if has_version '>=media-video/ffmpeg-2' ; then
epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
diff --git a/media-video/cinelerra/files/cinelerra-asm-gcc52.patch b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch
new file mode 100644
index 000000000000..1f46ad2afa90
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=562208
+
+Index: cinelerra-20140710/quicktime/mmx.h
+===================================================================
+--- cinelerra-20140710.orig/quicktime/mmx.h
++++ cinelerra-20140710/quicktime/mmx.h
+@@ -102,7 +102,7 @@ typedef union {
+ * are unused by Cinelerra CV. Inspired by change found in
+ * <URL: http://hg.libsdl.org/SDL/file/32f0f603a0c8/src/video/mmx.h >
+ */
+-#if !defined(__clang__)
++#if 0
+ /* Function to test if multimedia instructions are supported...
+ */
+ inline extern int
diff --git a/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
new file mode 100644
index 000000000000..646db9f25f05
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/show_bug.cgi?id=562208
+
+Index: cinelerra-20140710/toolame-02l/bitstream.c
+===================================================================
+--- cinelerra-20140710.orig/toolame-02l/bitstream.c
++++ cinelerra-20140710/toolame-02l/bitstream.c
+@@ -198,9 +198,6 @@ void put1bit (Bit_stream_struc * bs, int
+ }
+
+ /*write N bits into the bit stream */
+-#if !defined(__clang__)
+-INLINE
+-#endif /* not __clang__ */
+ void putbits (Bit_stream_struc * bs, unsigned int val, int N)
+ {
+ register int j = N;
+Index: cinelerra-20140710/toolame-02l/bitstream.h
+===================================================================
+--- cinelerra-20140710.orig/toolame-02l/bitstream.h
++++ cinelerra-20140710/toolame-02l/bitstream.h
+@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *
+ void put1bit (Bit_stream_struc *, int);
+ unsigned long look_ahead (Bit_stream_struc *, int);
+ unsigned long getbits (Bit_stream_struc *, int);
+-INLINE void putbits (Bit_stream_struc *, unsigned int, int);
++void putbits (Bit_stream_struc *, unsigned int, int);
+ void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
+ unsigned long byte_ali_getbits (Bit_stream_struc *, int);
+ unsigned long sstell (Bit_stream_struc *);
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index 59e2b8f78cb5..ffdcb3d23eb3 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/metadata.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
+ <email>brendan@horan.hk</email>
+ <name>Brendan Hhoran</name>
+ <description>Proxy maintainer, to be assigned all bugs</description>
</maintainer>
</pkgmetadata>
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3af48634ca2c..25bb19d2da2e 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Markus Meier <maekke@gentoo.org> (10 Oct 2015)
+# unkeyworded deps, bug #552330
+app-portage/g-sorcery bson
+
# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
# media-libs/rubberband lacks arm keyword, bug 548446
media-video/mpv rubberband
@@ -217,7 +221,7 @@ media-gfx/fim graphicsmagick svg
# Markus Meier <maekke@gentoo.org> (04 Aug 2013)
# Unkeyworded deps, bug #474026
-app-admin/conky lua-cairo lua-imlib xmms2 audacious moc
+app-admin/conky audacious cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
# Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
# Not tested
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 04:29:20 +0000