From: Anthony G. Basile Date: Mon, 2 Mar 2015 23:30:01 +0000 (+0000) Subject: Add epatch_user, bug #525832. Clean out older versions. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b32cf18443d9c2902d6ce09bdc3cce60618f571;p=gentoo.git Add epatch_user, bug #525832. Clean out older versions. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index c89ebbeb8466..02ac89f0bacf 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/avahi -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.282 2014/11/22 23:32:32 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.283 2015/03/02 23:29:49 blueness Exp $ + + 02 Mar 2015; Anthony G. Basile -avahi-0.6.30-r3.ebuild, + -avahi-0.6.31-r2.ebuild, -avahi-0.6.31-r5.ebuild, avahi-0.6.31-r7.ebuild: + Add epatch_user, bug #525832. Clean out older versions. *avahi-0.6.31-r7 (22 Nov 2014) diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index 7469141da491..bb225d484aa9 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -13,31 +13,25 @@ AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9f AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19 AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 SHA256 24954a76f0dfdffc9a079072f8f4d50e292f8ae2a2b8e5a49f488519057c51b0 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7 WHIRLPOOL f0859f44face57b0eefb6858203bbfa73d6c4be2aa684911d3a152eeca93f972eb81650c4c307b96cd5764c1b12ade6624574331c944db259159bc9321092edb AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67 -DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f SHA512 1b0ad0d509fd5e18c651ebe432d4cc85a62cb96e0b240a769ea2f600944eb90d143e4e5abb9057f7bc1a421b4aa743cf483fe8a888b4f63cab61577eda08d7f4 WHIRLPOOL 0c503606adb07741c5ef30b0f8af858cac97e5bf6e36549ed41bb1c76884e27fe234dffe1f8320e7c5570a3cf0032351d6b4c3d2c8905a1be832cb1bdce562e9 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f -EBUILD avahi-0.6.30-r3.ebuild 5804 SHA256 e4fd4ef76c2e6ba2803086500ce095cfd1760f14b8865760b69c8c654ae44fcf SHA512 1fa33ff17ece7b2b79c2615bfbfd2b3a22f4a29d415ce92ce1c41d330df31f6d68f40919264f425a79dce36271ecae3d1461a2a9674193e36e5939ecde952c78 WHIRLPOOL 035a893e3be89534140b1fc797c982e66ae9371b6d1215ca66050e817f633a499c9b924d7749e2d5ce7f760f6c3f0985e47efd4c7bc14031dd60bb89412ebd9c -EBUILD avahi-0.6.31-r2.ebuild 5173 SHA256 008708915ea5073e8bb58301efc2c3df85cc7327860320d130f3849ca88baecb SHA512 01b5ae7a03e3d0d8e4079515d3adc1b05d032bd7ed6db3b20423ddca7cf54326e1441086515f7cbb7e94d300ce34d5e23d1ba0ecfe5c49eee1af84a82f6f7d42 WHIRLPOOL 2aa4d3410fce721882f28042f334d55ac8950406be5094305955237169b9f61ff8737bda4255cc8c8b70ac1aa6d4d4dcf7e719ab19a65621341b2df6b77d7497 -EBUILD avahi-0.6.31-r5.ebuild 6339 SHA256 8f5dee9892e5f4062e06730cb0dec0539d1507531f0e5dc20c1edc9d3dd3e790 SHA512 e747759d81363f201ce09b35b2b9243d348f1d7c7b67807f870d50f981b764f0866cbe506463a08501b99b08bc6fa0ee594dabbafdfcc8c7e20952307e1fbcdc WHIRLPOOL 284f2db22c61b68f469fad6a719dd48c2074183d4c1053727577a3aa101a24b53bfeea39eec0c11f9aef2496a4d8da41ec9a812f0fb792f5bbc32f3016fc72bf EBUILD avahi-0.6.31-r6.ebuild 6334 SHA256 ef4994af6a430f7dac828149eee1af2bf045d0cd6024b3ed6a7c377d5efee856 SHA512 ee44cf4f6fdf34d1769c08d3ac16ae0e236a2e739b01b4df4069e04a24d40bf831c974683c01bc8e407be426ad9ddd9f69c446d600b9000f36d83644c2666656 WHIRLPOOL 5adffd87db3c3d14c3e8e711b79a9ee3762d8f3eff5c1bd74b0b7cace5e82d7b8ab364b45063eeda1a79afd1b516f93e8db82b19152c3f45c768926f22d2b9e7 -EBUILD avahi-0.6.31-r7.ebuild 6200 SHA256 f341cb94e5886bfe77c101d347e42104011a7eb0f71fb7a8ba101b0bd6b54980 SHA512 b470a0b8f52d12e697aca426c7411c8734a93bd2908dcce908ad55f090dd4f35ecb332c26ac8e0aedcf1940aaeb8a7385eedab256576175ac59bfbc9fdaf2f77 WHIRLPOOL bfafb6fb2fd1ae97d1c11ce3d0793b8b99ebdafdcaa1a6d8c7d09b5a673754ad1f956c5293b84df86ce2908d3b8d6f1de2c427c4cbdc5da2b09ce9dcad9fafe9 -MISC ChangeLog 41954 SHA256 fc16079c4c064c7bcafa07015c94fadd81880fc6c8f16e4cdeccbf49a6c29b3e SHA512 bb992c48487f37980a902095e1d4a56e61cd44b709d53affd2a60ad641454ef865780fe5e30eeb0e6c82e87ab8364142ff2fb8e53d6bc1426642b937db87bdd2 WHIRLPOOL 1b697dc13c4c9719d50f64dbe63ad29230372d101c26d5d2fa5b6d40b2fef51b096fbebbe06e3fb737cc6ac57c8dbf45b3f40f7a31050b3306c932b787a1a7e8 +EBUILD avahi-0.6.31-r7.ebuild 6243 SHA256 c9db441e1756ac79628f8d2e43bc036642948ad7597a7afd24698b4579a1f4db SHA512 d4797d9304d9822ce12705b8d5a827fb1fbc92d7c2fbe274683c5386977faf61a65e7a4d58b85cbd52370320f081e190fe2a53684531aaabd43402c5e0d29040 WHIRLPOOL 8eac57ad3367b1b1b1e07d56f041e11de8803009dcf07489c634c5b133a515c2664ce23c5ea4a15dc7c695a2d361141a28f07dd22b7764326def170c0fa3251c +MISC ChangeLog 42172 SHA256 d8a5cf2c12989ad74cf2fff3e8c62bba500430cd97985e26144d3662af65fd17 SHA512 d0b78dde566de0d9e972fc2b367ca157e2fdeb57d7db6c0dd3b5548b775a6e5bb5b2fe7f3126854174456e4ba69b4505041c4a41127faacc1ec53b93a9dc1986 WHIRLPOOL ba39485199252a8a3c37030006de70d11366ff926d45b6d1d7c11308ab281eadab07faf722280bdf6076576e7ee4a237814eae42712c4e7a9a3491ca3965e821 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJUcR0RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOniMP/3hpYQaVOnMb4FdY620K7uEk -qwC+WGL//l2y4cVXZ34B885OtbL8eOYVJ9hkYy+ZklUUQGuugWkwePLv6ysCrR50 -+GGc/lW0i44SopxMBM1F8SfuatrKrPQJXaCvWnvabFWO9BxslQDL3oVlmjn3eMj2 -svqKoqhGbH08ni0azzMa+NT8OU/lHMOIVQNNjTbLHSrqhDFelHp8UD7VEzufTfKs -4Fx0eXJPCkDUXDrANnN4RiROF3wCZxs9Y5790CfQyDBTEH8umBbsW6aUbVcVUs6M -vs6JMDYwagNyPqZxAgvYsFIoSpgxEn+uhNJYGbes4ryTngGw6ZYRFx74CRDs778r -pCbMTdXGP3dt7/aeNJ1F39tw1UWEluq6fwgRdlzJKwkCxs0e7HrBO0nylgNd44+B -+eICV1++CBwWzAnuirt+j8+dWmZQGW0aSQMyjPD/nXkJI9vzutkR/4FOjRzJa/vY -k8FLMpuVisx72HN0DBDcp6vg7syMski5o82qk0bvgl7cl9ndhwMyeXPHds0Cjix0 -YbbULy7PhGLhlCX5DPaPOpCjA0yvcr+dWNDbfReMAWMwtptdVhQAYNTGp09VkqVn -FUZZv+mm/oYFTToVMQpC8/9Ec+FsX6DXC5uQqvOhO88pPwiCLp0/KyT12TjWQpF+ -d2sL0ghSuFVRwgRN6w/s -=RY1V +iQIcBAEBCAAGBQJU9PLuAAoJEJOE+m71LUu687oP/Atcg9ahj/o02QnAMmUMNPkC +rD/l2ubMoFO4u8z669XR0yXjcmB7VO+jIdFtSZai4Yym8KHkUNLoHWw6TtOACD/d +/NVLuZVPiD1rKA8mdl4btpFA1CmvkwnRkP/OsxELNkTEWkIS/098vxpC8IhZenjp +PrEYVrCv8D3rKhxUZZBURYhnXB+HWhEn3LTDhFKsrGHE27XeEWPRcPpZuUp06Wo5 +ZD/5ezedH+9+uls9sKRRLNektu2vsQC/ysky3Z09hgjutAj0AAsLBJoIKHyvKyYU +A3DRarXSnEwGSfVLT+6aG8V6TBDkJnqrZrtHGw8G91b0e7YU6G9Sh2FGa+6VSUxv +HRKbMIZCGelBAYE9fOKkrI7QtdZoFSfjTwoliVVRxz1wQhue9TgHB8LbW4kwCUS/ +Ghmjv1ZxR/ptQ0QhkwaBX9kyQxo5xICD33PbozVqMnMlKp18QXwlnKlocP+/tNcx +3TfwGEqLAy6gWtJ1nu4/Fu1AT82QG1pGQ1nZTZzIY/i6rOCRKuc5bWNgF8ay6K5+ +6K/3qioTAFrEOjtqMlmKBFvg24CoECb/7KUg0IkXL80FXaKwvob4WJABStMUAul8 +Bgj3wdwZK1iiDgyM5c0UVIycKFZ6asM2kBRWkNLXBh6Db4OzR98f1ZXJPv6dXd+a +g7lPjandMkizve+6aNEf +=5KdB -----END PGP SIGNATURE----- diff --git a/net-dns/avahi/avahi-0.6.30-r3.ebuild b/net-dns/avahi/avahi-0.6.30-r3.ebuild deleted file mode 100644 index 19a44c637d8e..000000000000 --- a/net-dns/avahi/avahi-0.6.30-r3.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.20 2014/05/16 18:53:22 swift Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="gdbm" -PYTHON_USE_WITH_OPT="python" - -WANT_AUTOMAKE=1.11 - -inherit autotools eutils mono python multilib flag-o-matic 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 hppa ia64 ~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 python qt4 selinux test utils" - -DBUS_DEPEND=">=sys-apps/dbus-0.30" -COMMON_DEPEND=">=dev-libs/libdaemon-0.14 - dev-libs/expat - dev-libs/glib:2 - gdbm? ( sys-libs/gdbm ) - qt4? ( dev-qt/qtcore:4 ) - gtk? ( >=x11-libs/gtk+-2.14.0:2 ) - gtk3? ( x11-libs/gtk+:3 ) - dbus? ( - ${DBUS_DEPEND} - python? ( dev-python/dbus-python ) - ) - mono? ( - >=dev-lang/mono-1.1.10 - gtk? ( >=dev-dotnet/gtk-sharp-2 ) - ) - howl-compat? ( ${DBUS_DEPEND} ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - mdnsresponder-compat? ( ${DBUS_DEPEND} ) - python? ( - gtk? ( >=dev-python/pygtk-2 ) - ) - selinux? ( sec-policy/selinux-avahi ) - bookmarks? ( - dev-python/twisted-core - dev-python/twisted-web - ) - kernel_linux? ( sys-libs/libcap )" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.5 - virtual/pkgconfig - doc? ( - app-doc/doxygen - mono? ( >=dev-lang/mono-1.1.8 ) - )" -RDEPEND="${COMMON_DEPEND} - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder )" - -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 - - # FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255 - if use utils && ! { use gtk || use gtk3; }; then - ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''" - 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 - - # 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" - - # Drop DEPRECATED flags, bug #384743 - sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die - - # Prevent .pyc files in DESTDIR - >py-compile - - epatch "${FILESDIR}"/${P}-automake-1.11.2.patch #397477 - epatch "${FILESDIR}"/${P}-parallel.patch #411351 - - eautoreconf -} - -src_configure() { - use sh && replace-flags -O? -O0 - - local myconf="--disable-static" - - 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 - - econf \ - --localstatedir="${EPREFIX}/var" \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --enable-glib \ - --enable-gobject \ - $(use_enable test tests) \ - $(use_enable autoipd) \ - $(use_enable mdnsresponder-compat compat-libdns_sd) \ - $(use_enable howl-compat compat-howl) \ - $(use_enable doc doxygen-doc) \ - $(use_enable mono) \ - $(use_enable dbus) \ - $(use_enable python) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable introspection) \ - $(use_enable utils gtk-utils) \ - --disable-qt3 \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - use doc && { emake avahi.devhelp || die ; } -} - -src_install() { - emake install DESTDIR="${D}" || die "make install failed" - use bookmarks && use python && use dbus && use gtk || \ - rm -f "${ED}"/usr/bin/avahi-bookmarks - - use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h - - if use autoipd; then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh || die - - insinto /$(get_libdir)/rc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} || die - - if use doc; then - dohtml -r doxygen/html/. || die - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die - fi - - # /usr/bin/avahi-bookmarks is installed only with USE="bookmarks dbus gtk python". - # /usr/bin/avahi-discover is installed only with USE="dbus gtk python". - use dbus && use gtk && use python && python_convert_shebangs -r 2 "${ED}usr/bin" - - find "${ED}" -name '*.la' -exec rm -f {} + -} - -pkg_postrm() { - use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover) -} - -pkg_postinst() { - use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover) - - if use autoipd; then - echo - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" - fi -} diff --git a/net-dns/avahi/avahi-0.6.31-r2.ebuild b/net-dns/avahi/avahi-0.6.31-r2.ebuild deleted file mode 100644 index 7967a4bfdeef..000000000000 --- a/net-dns/avahi/avahi-0.6.31-r2.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2014 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-r2.ebuild,v 1.17 2014/08/03 17:45:35 tgall Exp $ - -EAPI="5" - -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="gdbm" - -WANT_AUTOMAKE=1.11 - -inherit autotools eutils mono python-r1 multilib flag-o-matic user systemd - -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 ~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 python 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 - gdbm? ( sys-libs/gdbm ) - qt4? ( dev-qt/qtcore:4 ) - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - dbus? ( sys-apps/dbus ) - 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 ) - ) - selinux? ( sec-policy/selinux-avahi ) - bookmarks? ( - dev-python/twisted-core - dev-python/twisted-web - ) -" - -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - virtual/pkgconfig - doc? ( - app-doc/doxygen - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) -" - -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 - - # 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 - - # 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 -} - -src_configure() { - use sh && replace-flags -O? -O0 - - local myconf="--disable-static" - - if use python; then - python_export_best - myconf+=" - $(use_enable dbus python-dbus) - $(use_enable gtk pygtk) - " - fi - - if use mono; then - myconf+=" $(use_enable doc monodoc)" - fi - - # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module - unset DISPLAY - - econf \ - --localstatedir="${EPREFIX}/var" \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --enable-glib \ - --enable-gobject \ - $(use_enable test tests) \ - $(use_enable autoipd) \ - $(use_enable mdnsresponder-compat compat-libdns_sd) \ - $(use_enable howl-compat compat-howl) \ - $(use_enable doc doxygen-doc) \ - $(use_enable mono) \ - $(use_enable dbus) \ - $(use_enable python) \ - $(use_enable gtk) \ - $(use_enable gtk3) \ - $(use_enable introspection) \ - $(use_enable utils gtk-utils) \ - --disable-qt3 \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - $(systemd_with_unitdir) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - use doc && { emake avahi.devhelp || die ; } -} - -src_install() { - emake install DESTDIR="${D}" || die "make install failed" - use bookmarks && use python && use dbus && use gtk || \ - rm -f "${ED}"/usr/bin/avahi-bookmarks - - use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h - - if use autoipd; then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh || die - - insinto /$(get_libdir)/rc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} || die - - if use doc; then - dohtml -r doxygen/html/. || die - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die - fi - - find "${ED}" -name '*.la' -exec rm -f {} + -} - -pkg_postinst() { - if use autoipd; then - elog - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" - elog - fi -} diff --git a/net-dns/avahi/avahi-0.6.31-r5.ebuild b/net-dns/avahi/avahi-0.6.31-r5.ebuild deleted file mode 100644 index f4964650ab2d..000000000000 --- a/net-dns/avahi/avahi-0.6.31-r5.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2014 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-r5.ebuild,v 1.9 2014/08/30 18:45:02 blueness Exp $ - -EAPI="5" - -PYTHON_COMPAT=( python{2_6,2_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 ~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 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}] ) - 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 ) - ) - selinux? ( sec-policy/selinux-avahi ) - 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 ) -" - -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() { - # those steps should be done once-per-ebuild rather than per-ABI - use sh && replace-flags -O? -O0 - use python && python_export_best - - # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module - unset DISPLAY - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( --disable-static ) - - if use python; then - myconf+=( - $(multilib_native_use_enable dbus python-dbus) - $(multilib_native_use_enable gtk pygtk) - ) - fi - - if use mono; then - myconf+=( $(multilib_native_use_enable doc monodoc) ) - fi - - if ! multilib_is_native_abi; then - myconf+=( - # used by daemons only - --disable-libdaemon - --with-xml=none - ) - fi - - econf \ - --localstatedir="${EPREFIX}/var" \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --enable-glib \ - --enable-gobject \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable autoipd) \ - $(use_enable mdnsresponder-compat compat-libdns_sd) \ - $(use_enable howl-compat compat-howl) \ - $(multilib_native_use_enable doc doxygen-doc) \ - $(multilib_native_use_enable mono) \ - $(use_enable dbus) \ - $(multilib_native_use_enable python) \ - $(multilib_native_use_enable gtk) \ - $(multilib_native_use_enable gtk3) \ - $(use_enable nls) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable utils gtk-utils) \ - --disable-qt3 \ - $(multilib_native_use_enable qt4) \ - $(use_enable gdbm) \ - $(systemd_with_unitdir) \ - "${myconf[@]}" -} - -multilib_src_compile() { - emake - - multilib_is_native_abi && use doc && emake avahi.devhelp -} - -multilib_src_install() { - emake install DESTDIR="${D}" - use bookmarks && use python && use dbus && use gtk || \ - rm -f "${ED}"/usr/bin/avahi-bookmarks - - use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h - - if multilib_is_native_abi && use doc; then - dohtml -r doxygen/html/. || die - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die - fi -} - -multilib_src_install_all() { - if use autoipd; then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /$(get_libdir)/rc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - prune_libtool_files --all -} - -pkg_postinst() { - if use autoipd; then - elog - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_=( autoipd ) in /etc/conf.d/net!" - elog - fi -} diff --git a/net-dns/avahi/avahi-0.6.31-r7.ebuild b/net-dns/avahi/avahi-0.6.31-r7.ebuild index 4a45c278c226..30224a1f732f 100644 --- a/net-dns/avahi/avahi-0.6.31-r7.ebuild +++ b/net-dns/avahi/avahi-0.6.31-r7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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-r7.ebuild,v 1.1 2014/11/22 23:32:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r7.ebuild,v 1.2 2015/03/02 23:29:49 blueness Exp $ EAPI="5" @@ -18,7 +18,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 qt4 selinux test utils" REQUIRED_USE=" @@ -126,6 +126,9 @@ src_prepare() { # Fix references to Lennart's home directory, bug #466210 sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die + # Bug #525832 + epatch_user + # Prevent .pyc files in DESTDIR >py-compile