Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 525884 | Differences between
and this patch

Collapse All | Expand All

(-)a/net-dns/avahi/avahi-0.7.ebuild (-9 / +12 lines)
Lines 19-26 Link Here
19
LICENSE="LGPL-2.1"
19
LICENSE="LGPL-2.1"
20
SLOT="0"
20
SLOT="0"
21
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
21
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
22
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
22
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
23
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test"
23
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
24
24
25
REQUIRED_USE="
25
REQUIRED_USE="
26
	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
26
	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
Lines 34-40 Link Here
34
	dev-libs/expat
34
	dev-libs/expat
35
	dev-libs/glib:2[${MULTILIB_USEDEP}]
35
	dev-libs/glib:2[${MULTILIB_USEDEP}]
36
	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
36
	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
37
	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
37
	qt5? ( dev-qt/qtcore:5 )
38
	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
38
	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
39
	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
39
	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
40
	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
40
	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
Lines 70-75 Link Here
70
	selinux? ( sec-policy/selinux-avahi )
70
	selinux? ( sec-policy/selinux-avahi )
71
"
71
"
72
72
73
MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
74
75
PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
76
73
pkg_preinst() {
77
pkg_preinst() {
74
	enewgroup netdev
78
	enewgroup netdev
75
	enewgroup avahi
79
	enewgroup avahi
Lines 86-91 Link Here
86
}
90
}
87
91
88
src_prepare() {
92
src_prepare() {
93
	default
94
89
	if ! use ipv6; then
95
	if ! use ipv6; then
90
		sed -i \
96
		sed -i \
91
			-e s/use-ipv6=yes/use-ipv6=no/ \
97
			-e s/use-ipv6=yes/use-ipv6=no/ \
Lines 96-106 Link Here
96
		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
102
		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
97
		doxygen_to_devhelp.xsl || die
103
		doxygen_to_devhelp.xsl || die
98
104
99
	# Don't pick up wrong moc based on qtchooser default, bug #587830
100
	eapply "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
101
102
	eapply_user
103
104
	# Prevent .pyc files in DESTDIR
105
	# Prevent .pyc files in DESTDIR
105
	>py-compile
106
	>py-compile
106
107
Lines 140-145 Link Here
140
		)
141
		)
141
	fi
142
	fi
142
143
144
	myconf+=( $(multilib_native_use_enable qt5) )
145
143
	econf \
146
	econf \
144
		--localstatedir="${EPREFIX}/var" \
147
		--localstatedir="${EPREFIX}/var" \
145
		--with-distro=gentoo \
148
		--with-distro=gentoo \
Lines 162-168 Link Here
162
		$(use_enable nls) \
165
		$(use_enable nls) \
163
		$(multilib_native_use_enable introspection) \
166
		$(multilib_native_use_enable introspection) \
164
		--disable-qt3 \
167
		--disable-qt3 \
165
		$(use_enable qt4) \
168
		--disable-qt4 \
166
		$(use_enable gdbm) \
169
		$(use_enable gdbm) \
167
		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
170
		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
168
		"${myconf[@]}"
171
		"${myconf[@]}"

Return to bug 525884