[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/files/, net-dns/avahi/
commit: dc9c274903d99c87863b2cf60f2c3adb703284aa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 27 15:07:33 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 27 15:15:44 2021 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=dc9c2749
net-dns/avahi: hard-disable avahi-ui-sharp
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-dns/avahi/avahi-0.8-r2.ebuild | 14 +++---
.../files/avahi-0.8-disable-avahi-ui-sharp.patch | 57 ++
2 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild
b/net-dns/avahi/avahi-0.8-r2.ebuild
index 71213619..574cb8a6 100644
--- a/net-dns/avahi/avahi-0.8-r2.ebuild
+++ b/net-dns/avahi/avahi-0.8-r2.ebuild
@@ -3,12 +3,12 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="gdbm"
inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd
DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/;
+HOMEPAGE="https://avahi.org/;
SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
@@ -39,10 +39,7 @@ DEPEND="
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
kernel_linux? ( sys-libs/libcap )
introspection? ( dev-libs/gobject-introspection:= )
- mono? (
- dev-lang/mono
- gtk2? ( dev-dotnet/gtk-sharp:2 )
- )
+ mono? ( dev-lang/mono )
python? (
${PYTHON_DEPS}
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
@@ -77,16 +74,17 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/avahi-qt5/qt-watch.h
)
+PATCHES=(
+ "${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062
# These patches do not apply cleanly but may need to be re-instated.
# I'll leave them commented out for now.
-#PATCHES=(
# "${FILESDIR}/${PN}-0.7-qt5.patch"
# "${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch"
# "${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch"
# "${FILESDIR}/${PN}-0.7-python3.patch"
# "${FILESDIR}/${PN}-0.7-python3-unittest.patch"
# "${FILESDIR}/${PN}-0.7-python3-gdbm.patch"
-#)
+)
pkg_setup() {
use mono && mono-env_pkg_setup
diff --git a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
new file mode 100644
index ..31b361d4
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
@@ -0,0 +1,57 @@
+From ebd2a01a7b5e88f3be35b2f803d5adbd36ae6593 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 27 Mar 2021 22:49:08 +0100
+Subject: [PATCH] Disable avahi-ui-sharp
+
+Signed-off-by: Andreas Sturmlechner
+---
+ Makefile.am | 6 ++
+ configure.ac | 1 -
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 33c51f5..0e12120 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -46,7 +46,6 @@ EXTRA_DIST = \
+ avahi-qt4.pc.in \
+ avahi-qt5.pc.in \
+ avahi-sharp.pc.in \
+- avahi-ui-sharp.pc.in \
+ avahi-compat-libdns_sd.pc.in \
+ avahi-compat-howl.pc.in \
+ avahi-ui.pc.in \
+@@ -77,7 +76,6 @@ SUBDIRS = \
+ avahi-compat-howl \
+ avahi-autoipd \
+ avahi-ui \
+- avahi-ui-sharp \
+ avahi-libevent \
+ po
+
+@@ -188,8 +186,8 @@ CLEANFILES += avahi-compat-libdns_sd.pc
+ endif
+
+ if HAVE_MONO
+-pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc
+-CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc
++pkgconfig_DATA += avahi-sharp.pc
++CLEANFILES += avahi-sharp.pc
+ endif
+
+ endif
+diff --git a/configure.ac b/configure.ac
+index 58db8c7..844360f 100644
+--- a/configure.ac
b/configure.ac
+@@ -1166,7 +1166,6 @@ man/Makefile
+ tests/Makefile
+ service-type-database/Makefile
+ avahi-sharp/Makefile
+-avahi-ui-sharp/Makefile
+ avahi-compat-libdns_sd/Makefile
+ avahi-compat-howl/Makefile
+ avahi-compat-howl/samples/Makefile
+--
+2.31.1
+
[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/
commit: 81618f5dd4d4f04e95c48cdae33fc08e9be34122
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 1 20:15:12 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 1 20:21:54 2021 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=81618f5d
net-dns/avahi: 0.8-r2 version bump re-enabled with IUSE=qt4
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-dns/avahi/avahi-0.6.31-r6.ebuild | 234 ---
net-dns/avahi/avahi-0.8-r2.ebuild| 216
net-dns/avahi/metadata.xml | 20 ++-
3 files changed, 223 insertions(+), 247 deletions(-)
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild
b/net-dns/avahi/avahi-0.6.31-r6.ebuild
deleted file mode 100644
index 9ed29766..
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-WANT_AUTOMAKE=1.11
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env
python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/;
-SRC_URI="http://avahi.org/download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
- utils? ( gtk )
- python? ( ${PYTHON_REQUIRED_USE} dbus gdbm )
- mono? ( dbus )
- howl-compat? ( dbus )
- mdnsresponder-compat? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/libdaemon
- dev-libs/expat
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- qt4? ( dev-qt/qtcore:4 )
- gtk? ( x11-libs/gtk+:3 )
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
- kernel_linux? ( sys-libs/libcap )
- introspection? ( dev-libs/gobject-introspection )
- mono? ( dev-lang/mono )
- python? (
- ${PYTHON_DEPS}
- dbus? ( dev-python/dbus-python )
- )
- bookmarks? ( dev-python/twisted )
-"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- >=virtual/pkgconfig-0-r1
- doc? ( app-doc/doxygen )
-"
-
-RDEPEND="${COMMON_DEPEND}
- howl-compat? ( !net-misc/howl )
- mdnsresponder-compat? ( !net-misc/mDNSResponder )
- selinux? ( sec-policy/selinux-avahi )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- # necessary until the UI libraries are ported
- /usr/include/avahi-qt4/qt-watch.h
- /usr/include/avahi-ui/avahi-ui.h
-)
-
-pkg_preinst() {
- enewgroup netdev
- enewgroup avahi
- enewuser avahi -1 -1 -1 avahi
-
- if use autoipd; then
- enewgroup avahi-autoipd
- enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
- fi
-}
-
-pkg_setup() {
- use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
- if use ipv6; then
- sed -i \
- -e s/use-ipv6=no/use-ipv6=yes/ \
- avahi-daemon/avahi-daemon.conf || die
- fi
-
- sed -i\
- -e
"s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
- doxygen_to_devhelp.xsl || die
-
- # Make gtk utils optional
- epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
- # Fix init scripts for >=openrc-0.9.0, bug #383641
- epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
- # install-exec-local -> install-exec-hook
- epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
- # Backport host-name-from-machine-id patch, bug #466134
- epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
- # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
- epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
-
- epatch
"${FILESDIR}"/${P}-so_reuseport-may-not-exist-in-running-kernel.patch
-
- # allow building client without the daemon
- epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch
-
- # Fix build under various locales, bug #501664
- epatch "${FILESDIR}"/${P}-fix-locale-build.patch
-
- # Drop DEPRECATED flags, bug #384743
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am ||
die
-
- # Fix references to Lennart's home directory, bug #466210
- sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
-
- # Prevent .pyc files in DESTDIR
- >py-compile
-
- eautoreconf
-
- # bundled manpages
- multilib_copy_sources
-}
-
-src_configure() {
-
[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/
commit: 72d31c789da900c1133712b5f52c085f4bd43a47
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 2 23:06:01 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 3 00:45:57 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=72d31c78
net-dns/avahi: Fix PythonMissingRequiredUse, MissingTestRestrict
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-dns/avahi/avahi-0.6.31-r6.ebuild | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild
b/net-dns/avahi/avahi-0.6.31-r6.ebuild
index 50670e76..9ed29766 100644
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -5,9 +5,7 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="gdbm"
-
WANT_AUTOMAKE=1.11
-
inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env
python-r1 systemd user
DESCRIPTION="System which facilitates service discovery on a local network"
@@ -21,12 +19,14 @@ IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat
+introspection ipv6 kernel
REQUIRED_USE="
utils? ( gtk )
- python? ( dbus gdbm )
+ python? ( ${PYTHON_REQUIRED_USE} dbus gdbm )
mono? ( dbus )
howl-compat? ( dbus )
mdnsresponder-compat? ( dbus )
"
+RESTRICT="!test? ( test )"
+
COMMON_DEPEND="
dev-libs/libdaemon
dev-libs/expat
@@ -45,15 +45,13 @@ COMMON_DEPEND="
bookmarks? ( dev-python/twisted )
"
-DEPEND="
- ${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}
dev-util/intltool
>=virtual/pkgconfig-0-r1
doc? ( app-doc/doxygen )
"
-RDEPEND="
- ${COMMON_DEPEND}
+RDEPEND="${COMMON_DEPEND}
howl-compat? ( !net-misc/howl )
mdnsresponder-compat? ( !net-misc/mDNSResponder )
selinux? ( sec-policy/selinux-avahi )
[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/
commit: 6df2809d20d071623c273840b8391522d20e2bea
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 30 01:15:39 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 30 01:15:39 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6df2809d
net-dns/avahi: Drop IUSE=qt3
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-dns/avahi/avahi-0.6.31-r6.ebuild | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild
b/net-dns/avahi/avahi-0.6.31-r6.ebuild
index b140ed6d..092c3e2c 100644
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -8,8 +8,7 @@ PYTHON_REQ_USE="gdbm"
WANT_AUTOMAKE=1.11
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
- python-r1 systemd user
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env
python-r1 systemd user
DESCRIPTION="System which facilitates service discovery on a local network"
HOMEPAGE="http://avahi.org/;
@@ -18,7 +17,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa m68k ~mips ~ppc ~ppc64 s390 ~sparc x86
~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils"
+IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
REQUIRED_USE="
utils? ( gtk )
@@ -33,7 +32,6 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- qt3? ( dev-qt/qt-meta:3 )
qt4? ( dev-qt/qtcore:4 )
gtk? ( x11-libs/gtk+:3 )
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
@@ -186,7 +184,7 @@ multilib_src_configure() {
$(use_enable nls) \
$(multilib_native_use_enable introspection) \
$(multilib_native_use_enable utils gtk-utils) \
- $(multilib_native_use_enable qt3) \
+ --disable-qt3 \
$(multilib_native_use_enable qt4) \
$(use_enable gdbm) \
$(systemd_with_unitdir) \
[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/
commit: 559f842afc8e794b01bbd0a1861b5069fb219202
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 24 12:17:23 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 25 17:21:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=559f842a
net-dns/avahi: Drop old, IUSE=gtk3->gtk, drop pygtk dependency
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-dns/avahi/avahi-0.6.28-r1.ebuild | 202 -
net-dns/avahi/avahi-0.6.30-r1.ebuild | 210 ---
net-dns/avahi/avahi-0.6.31-r2.ebuild | 209 --
net-dns/avahi/avahi-0.6.31-r6.ebuild | 33 ++
net-dns/avahi/metadata.xml | 5 +-
5 files changed, 12 insertions(+), 647 deletions(-)
diff --git a/net-dns/avahi/avahi-0.6.28-r1.ebuild
b/net-dns/avahi/avahi-0.6.28-r1.ebuild
deleted file mode 100644
index f9120d68..
--- a/net-dns/avahi/avahi-0.6.28-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28-r1.ebuild,v 1.7
2011/03/05 13:42:05 armin76 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils mono python multilib flag-o-matic
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/;
-SRC_URI="http://avahi.org/download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux
mdnsresponder-compat mono python qt3 qt4 test "
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-RDEPEND=">=dev-libs/libdaemon-0.14
- dev-libs/expat
- >=dev-libs/glib-2
- gdbm? ( sys-libs/gdbm )
- qt3? ( dev-qt/qt-meta:3 )
- qt4? ( dev-qt/qtcore:4 )
- gtk? (
- >=x11-libs/gtk+-2.14.0:2
- )
- dbus? (
- ${DBUS_DEPEND}
- python? ( dev-python/dbus-python )
- )
- mono? (
- >=dev-lang/mono-1.1.10
- gtk? ( >=dev-dotnet/gtk-sharp-2 )
- )
- howl-compat? (
- !net-misc/howl
- ${DBUS_DEPEND}
- )
- mdnsresponder-compat? (
- !net-misc/mDNSResponder
- ${DBUS_DEPEND}
- )
- python? (
- gtk? ( >=dev-python/pygtk-2 )
- )
- bookmarks? (
- dev-python/twisted
- dev-python/twisted-web
- )
- kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40.5
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- mono? ( >=virtual/monodoc-1.1.8 )
- )"
-
-pkg_setup() {
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-
- if use python && ! use dbus && ! use gtk; then
- ewarn "For proper python support you should also enable the
dbus and gtk USE flags!"
- fi
-}
-
-pkg_preinst() {
- enewgroup netdev
- enewgroup avahi
- enewuser avahi -1 -1 -1 avahi
-
- if use autoipd; then
- enewgroup avahi-autoipd
- enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
- fi
-}
-
-src_prepare() {
- if use ipv6; then
- sed -i \
- -e s/use-ipv6=no/use-ipv6=yes/ \
- avahi-daemon/avahi-daemon.conf || die
- fi
-
- sed -i\
- -e
"s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
- doxygen_to_devhelp.xsl || die
-
- epatch
"${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch
- epatch "${FILESDIR}"/${P}-CVE-2011-1002.patch
-}
-
-src_configure() {
- use sh && replace-flags -O? -O0
-
- local myconf=""
-
- if use python; then
- myconf+="
- $(use_enable dbus python-dbus)
- $(use_enable gtk pygtk)
- "
- fi
-
- if use mono; then
- myconf+=" $(use_enable doc monodoc)"
- fi
-
- # these require dbus enabled
- if use mdnsresponder-compat || use howl-compat || use mono; then
- myconf+=" --enable-dbus"
- fi
-
- # We need to unset DISPLAY, else the configure script might have
problems detecting the pygtk module
- unset DISPLAY
-
- # Upstream ships a gir file (AvahiCore.gir) which does not work with
- # >=gobject-introspection-0.9, so we disable introspection for now.
- # http://avahi.org/ticket/318
- econf \
- --localstatedir=/var \
- --with-distro=gentoo \
- --disable-python-dbus \
-
[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/, dev-db/unixODBC/, sys-apps/hal/
commit: b761d4320166980a3437eef7b19bf6fdd7f73f5a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 24 11:13:24 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Aug 24 12:00:16 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b761d432
*/*: Drop sh from KEYWORDS
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild | 2 +-
dev-db/unixODBC/unixODBC-2.2.12.ebuild| 2 +-
net-dns/avahi/avahi-0.6.28-r1.ebuild | 2 +-
net-dns/avahi/avahi-0.6.30-r1.ebuild | 2 +-
net-dns/avahi/avahi-0.6.31-r2.ebuild | 2 +-
net-dns/avahi/avahi-0.6.31-r6.ebuild | 2 +-
sys-apps/hal/hal-0.5.14-r4.ebuild | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index e58eeca2..2cf00694 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
@@ -7,7 +7,7 @@ WANT_AUTOMAKE="latest"
inherit eutils multilib autotools
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
DESCRIPTION="ODBC Interface for Linux."
HOMEPAGE="http://www.unixodbc.org/;
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
index 711f7f17..c3858272 100644
--- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -9,7 +9,7 @@ PATCH_P="${PN}-${PATCH_VERSION}-patches"
inherit eutils multilib autotools gnuconfig libtool
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
DESCRIPTION="ODBC Interface for Linux."
HOMEPAGE="http://www.unixodbc.org/;
diff --git a/net-dns/avahi/avahi-0.6.28-r1.ebuild
b/net-dns/avahi/avahi-0.6.28-r1.ebuild
index 2912b919..e5c26f2f 100644
--- a/net-dns/avahi/avahi-0.6.28-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.28-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux
mdnsresponder-compat mono python qt3 qt4 test "
DBUS_DEPEND=">=sys-apps/dbus-0.30"
diff --git a/net-dns/avahi/avahi-0.6.30-r1.ebuild
b/net-dns/avahi/avahi-0.6.30-r1.ebuild
index 16caa50a..f6b8998e 100644
--- a/net-dns/avahi/avahi-0.6.30-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
~x86-linux"
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils"
diff --git a/net-dns/avahi/avahi-0.6.31-r2.ebuild
b/net-dns/avahi/avahi-0.6.31-r2.ebuild
index bb544465..38da3348 100644
--- a/net-dns/avahi/avahi-0.6.31-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 ~sh ~sparc x86
~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 ~sparc x86 ~x86-linux"
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils"
REQUIRED_USE="
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild
b/net-dns/avahi/avahi-0.6.31-r6.ebuild
index c32f604f..fd08cc90 100644
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa m68k ~mips ppc ppc64 s390 sh ~sparc x86
~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa m68k ~mips ppc ppc64 s390 ~sparc x86
~x86-linux"
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils"
REQUIRED_USE="
diff --git a/sys-apps/hal/hal-0.5.14-r4.ebuild
b/sys-apps/hal/hal-0.5.14-r4.ebuild
index 883d289d..a8ba3e5d 100644
--- a/sys-apps/hal/hal-0.5.14-r4.ebuild
+++ b/sys-apps/hal/hal-0.5.14-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://kde-sunset/${MY_P}.tar.bz2
LICENSE="|| ( GPL-2 AFL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
KERNEL_IUSE="kernel_linux kernel_FreeBSD"
IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux
${KERNEL_IUSE}"
[gentoo-commits] proj/kde-sunset:master commit in: net-dns/avahi/files/, net-dns/avahi/
commit: 80c97455ba0a46d74deee8c683fabfc461585427
Author: Ian Stakenvicius axs AT gentoo DOT org
AuthorDate: Tue Apr 28 14:08:53 2015 +
Commit: Ian Stakenvicius axs AT gentoo DOT org
CommitDate: Tue Apr 28 14:10:30 2015 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=80c97455
net-dns/avahi: brought current stable from gentoo repo, re-adding qt3 flag
Signed-off-by: Ian Stakenvicius axs AT gentoo.org
net-dns/avahi/avahi-0.6.31-r6.ebuild | 249 +
.../avahi-0.6.31-build-client-without-daemon.patch | 27 +++
.../files/avahi-0.6.31-fix-locale-build.patch | 20 ++
...reuseport-may-not-exist-in-running-kernel.patch | 30 +++
4 files changed, 326 insertions(+)
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild
b/net-dns/avahi/avahi-0.6.31-r6.ebuild
new file mode 100644
index 000..0d03a58
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r6.ebuild,v 1.11
2015/04/08 18:16:54 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=gdbm
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
+ python-r1 systemd user
+
+DESCRIPTION=System which facilitates service discovery on a local network
+HOMEPAGE=http://avahi.org/;
+SRC_URI=http://avahi.org/download/${P}.tar.gz;
+
+LICENSE=LGPL-2.1
+SLOT=0
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils
+
+REQUIRED_USE=
+ utils? ( || ( gtk gtk3 ) )
+ python? ( dbus gdbm )
+ mono? ( dbus )
+ howl-compat? ( dbus )
+ mdnsresponder-compat? ( dbus )
+
+
+COMMON_DEPEND=
+ dev-libs/libdaemon
+ dev-libs/expat
+ =dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ gdbm? ( =sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+ qt3? ( dev-qt/qt-meta:3 )
+ qt4? ( dev-qt/qtcore:4 )
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
+ dbus? ( =sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ kernel_linux? ( sys-libs/libcap )
+ introspection? ( dev-libs/gobject-introspection )
+ mono? (
+ dev-lang/mono
+ gtk? ( dev-dotnet/gtk-sharp )
+ )
+ python? (
+ ${PYTHON_DEPS}
+ gtk? ( dev-python/pygtk )
+ dbus? ( dev-python/dbus-python )
+ )
+ bookmarks? (
+ dev-python/twisted-core
+ dev-python/twisted-web
+ )
+
+
+DEPEND=
+ ${COMMON_DEPEND}
+ dev-util/intltool
+ =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? (
+ app-doc/doxygen
+ )
+
+
+RDEPEND=
+ ${COMMON_DEPEND}
+ howl-compat? ( !net-misc/howl )
+ mdnsresponder-compat? ( !net-misc/mDNSResponder )
+ selinux? ( sec-policy/selinux-avahi )
+
+
+MULTILIB_WRAPPED_HEADERS=(
+ # necessary until the UI libraries are ported
+ /usr/include/avahi-qt4/qt-watch.h
+ /usr/include/avahi-ui/avahi-ui.h
+)
+
+pkg_preinst() {
+ enewgroup netdev
+ enewgroup avahi
+ enewuser avahi -1 -1 -1 avahi
+
+ if use autoipd; then
+ enewgroup avahi-autoipd
+ enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+ fi
+}
+
+pkg_setup() {
+ use mono mono-env_pkg_setup
+}
+
+src_prepare() {
+ if use ipv6; then
+ sed -i \
+ -e s/use-ipv6=no/use-ipv6=yes/ \
+ avahi-daemon/avahi-daemon.conf || die
+ fi
+
+ sed -i\
+ -e
s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/: \
+ doxygen_to_devhelp.xsl || die
+
+ # Make gtk utils optional
+ epatch ${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch
+
+ # Fix init scripts for =openrc-0.9.0, bug #383641
+ epatch ${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+ # install-exec-local - install-exec-hook
+ epatch ${FILESDIR}/${P}-install-exec-hook.patch
+
+ # Backport host-name-from-machine-id patch, bug #466134
+ epatch ${FILESDIR}/${P}-host-name-from-machine-id.patch
+
+ # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+ epatch ${FILESDIR}/${P}-fix-install-avahi-discover.patch
+
+ epatch
${FILESDIR}/${P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+ # allow building client without the daemon
+ epatch ${FILESDIR}/${P}-build-client-without-daemon.patch
+
+ # Fix build under various locales, bug #501664
+ epatch ${FILESDIR}/${P}-fix-locale-build.patch
+
+ # Drop
