From 7101b0e047d5d761bf5059c4dc39f5d4f4bccd5f Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Tue, 24 Apr 2007 20:13:47 +0000 Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.2.4 --- net-dns/avahi/ChangeLog | 6 +- net-dns/avahi/Manifest | 26 +-- net-dns/avahi/avahi-0.6.15.ebuild | 170 -------------------- net-dns/avahi/files/0.6.15-dbus-fixes.patch | 57 ------- net-dns/avahi/files/digest-avahi-0.6.15 | 3 - 5 files changed, 12 insertions(+), 250 deletions(-) delete mode 100644 net-dns/avahi/avahi-0.6.15.ebuild delete mode 100644 net-dns/avahi/files/0.6.15-dbus-fixes.patch delete mode 100644 net-dns/avahi/files/digest-avahi-0.6.15 diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index 6bf8ac48a916..960443c604d8 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/avahi # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.98 2007/04/22 13:52:02 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.99 2007/04/24 20:13:47 swegener Exp $ + + 24 Apr 2007; Sven Wegener + -files/0.6.15-dbus-fixes.patch, -avahi-0.6.15.ebuild: + Cleanup. 21 Apr 2007; Sven Wegener avahi-0.6.18.ebuild: Readd ~x86-fbsd keyword. diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index b49f343dd00f..facebaffb31d 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -1,10 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.6.15-dbus-fixes.patch 1647 RMD160 5d120cb23fae7d4603456593ef1b07eb842d5e0d SHA1 29ca0c669f1e03b729cd053aba560a775f2685c5 SHA256 733f4a3d5d6e9f10c7e1bec045e566c09fa128ca6043f90190f9235cc4fbcbb4 -MD5 d3d5b3538c1d66c747b02296b957d9fa files/0.6.15-dbus-fixes.patch 1647 -RMD160 5d120cb23fae7d4603456593ef1b07eb842d5e0d files/0.6.15-dbus-fixes.patch 1647 -SHA256 733f4a3d5d6e9f10c7e1bec045e566c09fa128ca6043f90190f9235cc4fbcbb4 files/0.6.15-dbus-fixes.patch 1647 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 MD5 873dca478a6a7bd3931f462becade245 files/autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 files/autoipd.sh 1271 @@ -53,14 +49,9 @@ AUX avahi-0.6.18-inotify-ifdef-fix.patch 455 RMD160 abc10c1cd74192f545e43fd6a0cf MD5 5e626d1ed9e0f9ec6d1fe4b586cf0eca files/avahi-0.6.18-inotify-ifdef-fix.patch 455 RMD160 abc10c1cd74192f545e43fd6a0cfcc8002515a0d files/avahi-0.6.18-inotify-ifdef-fix.patch 455 SHA256 165a156b28e0c7b4784138ebdc0ebffd7c47a675320f74323345545633e04710 files/avahi-0.6.18-inotify-ifdef-fix.patch 455 -DIST avahi-0.6.15.tar.gz 892455 RMD160 c288d193f96751283065c4002d50ee139586e8b0 SHA1 b6ad5c4be1b868b1d8ccb14370c82bb8f01f8236 SHA256 21dc28f464dbf158ad15dc5ee9d0bad78215ef5633086e55b7201294d5841da0 DIST avahi-0.6.16.tar.gz 891970 RMD160 0106c3082867715052b416e3c761d8f052de00a0 SHA1 8e684d29a16f6fda3c6a0458299134124d64b5ae SHA256 794d4d1c485d4dc24659a25feb92706eb8bff4552333a1df83e856db123c36ce DIST avahi-0.6.17.tar.gz 927202 RMD160 cac51c09730e1faf10bf0e11f091be3fd5f138d8 SHA1 3f7d293b72ca1c5269fa4b1e68b453d8ec3ff8f9 SHA256 2cb6a15a9fff56c0d24f3a95b7f67c52436a88716e640c7f7afd48c9a5cbd740 DIST avahi-0.6.18.tar.gz 961748 RMD160 687dd4d84e175916ec3555314721068d75ad8943 SHA1 cec71de1b8cd939e847972dfea33217999bf7cd0 SHA256 11a0270cdf1220943ce8f3a79b705c6de6e57d94a058ee2efa9592037b4a4274 -EBUILD avahi-0.6.15.ebuild 4176 RMD160 98028ffb701ba1fd9d02c87e6b6d14801d4b78a5 SHA1 6c2df25cd19d76cac38616768231313509eed024 SHA256 690b89245901299100cc438ee7858a48ec5e8d7b461b3ea7d4c8c2f3f732ff68 -MD5 633de2ca94b87b711056addcc0270f09 avahi-0.6.15.ebuild 4176 -RMD160 98028ffb701ba1fd9d02c87e6b6d14801d4b78a5 avahi-0.6.15.ebuild 4176 -SHA256 690b89245901299100cc438ee7858a48ec5e8d7b461b3ea7d4c8c2f3f732ff68 avahi-0.6.15.ebuild 4176 EBUILD avahi-0.6.16-r1.ebuild 4510 RMD160 e04a6fcdef5fe9cc59f924c2c008d440faf76bfc SHA1 9d024137207684dcbe6524aed4bdbace785f49e8 SHA256 33fd40c6c03817c91cf548b17d2c4873914dc95d8c1ba7eecd4b69d47ec0562f MD5 c32c6f25625574f41c3681bc617dab9c avahi-0.6.16-r1.ebuild 4510 RMD160 e04a6fcdef5fe9cc59f924c2c008d440faf76bfc avahi-0.6.16-r1.ebuild 4510 @@ -73,17 +64,14 @@ EBUILD avahi-0.6.18.ebuild 4335 RMD160 b7f71475eb72a6e8b3264f95da09bd1e8ab02ecc MD5 0c2b629067fa128ecb1eb1bc6dad1612 avahi-0.6.18.ebuild 4335 RMD160 b7f71475eb72a6e8b3264f95da09bd1e8ab02ecc avahi-0.6.18.ebuild 4335 SHA256 eff83e0c0f6c79b26666e11804e5515fcbded04c508732c92f053b4a5f149b83 avahi-0.6.18.ebuild 4335 -MISC ChangeLog 13228 RMD160 def6edf6788b89ba456168a24caa0e86767ad553 SHA1 6f0d1649d88a3cdfc2865750cb706962aa7cea93 SHA256 df5fd05e7b87fdbb1f6ca93b8f178098c605e49def5d19dd9ab74baf61786d6b -MD5 1e209a173077b9d7c27ce95da8a3a904 ChangeLog 13228 -RMD160 def6edf6788b89ba456168a24caa0e86767ad553 ChangeLog 13228 -SHA256 df5fd05e7b87fdbb1f6ca93b8f178098c605e49def5d19dd9ab74baf61786d6b ChangeLog 13228 +MISC ChangeLog 13346 RMD160 366145f0fb2849751b43298d8f62c775c5dae816 SHA1 21af49651c93440ca18e20cfdbc6a29824697036 SHA256 7e34c9cda6bbdabe383c7b9812e9d0afced8625b85b50fbaa8369f28ed2b62b7 +MD5 34d81e368db0ffcb6d50a9596092b473 ChangeLog 13346 +RMD160 366145f0fb2849751b43298d8f62c775c5dae816 ChangeLog 13346 +SHA256 7e34c9cda6bbdabe383c7b9812e9d0afced8625b85b50fbaa8369f28ed2b62b7 ChangeLog 13346 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d metadata.xml 223 -MD5 23815a4887561501c51eb7b6a63646b8 files/digest-avahi-0.6.15 238 -RMD160 a8269968c6333ac231f868cf577f6899be16300b files/digest-avahi-0.6.15 238 -SHA256 0d0868d27f53d49fc385a54124696193f69ae5b8a7de3c8496df5af227594bce files/digest-avahi-0.6.15 238 MD5 8aa4fe4af3aa3c0f161ad400add7fbf6 files/digest-avahi-0.6.16-r1 238 RMD160 bd1113ac391bce31d10cc8acb8e5720b3b56d8d7 files/digest-avahi-0.6.16-r1 238 SHA256 fc63dba6c511d1588e7866f900ebbb3defb54ed3cc455f871c35b473549c0371 files/digest-avahi-0.6.16-r1 238 @@ -96,7 +84,7 @@ SHA256 11372c91a1b12a5b2930aa3fc3ff38c756c108f7a4a42bbef1e02636ef434e7a files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGK2iKI1lqEGTUzyQRApa0AJ48MevtmRL7MeLo3+MPOaFRozErfwCfaPSx -rx7r/XDBHNbir4ziT9ImMsA= -=FXwZ +iD8DBQFGLmUGI1lqEGTUzyQRAi8RAKCy1wkrFeZzdRXqLqxgQT1PFdX6lACg3grM +j6S+tGEg7A0lygsCagahE3g= +=+psr -----END PGP SIGNATURE----- diff --git a/net-dns/avahi/avahi-0.6.15.ebuild b/net-dns/avahi/avahi-0.6.15.ebuild deleted file mode 100644 index b85a4bec0084..000000000000 --- a/net-dns/avahi/avahi-0.6.15.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 2000-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.15.ebuild,v 1.11 2006/11/15 13:21:05 corsair Exp $ - -inherit eutils mono python qt3 qt4 - -DESCRIPTION="System which facilitates service discovery on a local network" -HOMEPAGE="http://avahi.org/" -SRC_URI="http://avahi.org/download/${P}.tar.gz - http://lathiat.net/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd" - -RDEPEND=">=dev-libs/libdaemon-0.5 - dev-libs/expat - >=dev-libs/glib-2 - gdbm? ( sys-libs/gdbm ) - qt3? ( $(qt_min_version 3.3.6-r2) ) - qt4? ( $(qt4_min_version 4) ) - gtk? ( - >=x11-libs/gtk+-2 - >=gnome-base/libglade-2 - ) - dbus? ( - >=sys-apps/dbus-0.30 - python? ( - || ( - dev-python/dbus-python - ( - =sys-apps/dbus-0.30 - ) - ) - ) - ) - mono? ( >=dev-lang/mono-1.1.10 ) - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - python? ( - >=virtual/python-2.4 - gtk? ( >=dev-python/pygtk-2 ) - ) - bookmarks? ( - dev-python/twisted - dev-python/twisted-web - )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9.0 - doc? ( - app-doc/doxygen - mono? ( >=dev-util/monodoc-1.1.8 ) - )" - -pkg_setup() { - if use python && ! built_with_use dev-lang/python gdbm - then - die "For python support you need dev-lang/python compiled with gdbm support!" - fi - - if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python - then - die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!" - fi - - if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus - then - die "For *-compat or mono support you also need to enable the dbus USE flag!" - fi - - if use bookmarks && ! ( use python && use dbus && use gtk ) - then - die "For bookmarks support you also need to enable the python, 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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch - epatch "${FILESDIR}"/${PV}-dbus-fixes.patch -} - -src_compile() { - local myconf="" - - if use python - then - use dbus && myconf="${myconf} --enable-python-dbus" - use gtk && myconf="${myconf} --enable-pygtk" - fi - - if use mono && use doc - then - myconf="${myconf} --enable-monodoc" - fi - - # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module - unset DISPLAY - - econf \ - --localstatedir=/var \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --enable-glib \ - $(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 qt3) \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - ${myconf} \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make install DESTDIR="${D}" || die "make install failed" - use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks - - use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h - - if use autoipd - then - insinto /lib/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - fi - - dodoc docs/{AUTHORS,README,TODO} -} - -pkg_postrm() { - use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi -} - -pkg_postinst() { - use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi - - if use autoipd - then - einfo - einfo "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - einfo "addresses, just set config_=( autoipd ) in /etc/conf.net!" - einfo - fi -} diff --git a/net-dns/avahi/files/0.6.15-dbus-fixes.patch b/net-dns/avahi/files/0.6.15-dbus-fixes.patch deleted file mode 100644 index efd489fd9023..000000000000 --- a/net-dns/avahi/files/0.6.15-dbus-fixes.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://avahi.org/ticket/68 -http://avahi.org/ticket/71 - -Index: trunk/avahi-daemon/dbus-protocol.c -=================================================================== ---- trunk/avahi-daemon/dbus-protocol.c (revision 1299) -+++ trunk/avahi-daemon/dbus-protocol.c (revision 1333) -@@ -1067,10 +1067,10 @@ - if (dbus_bus_request_name( - server->bus, - AVAHI_DBUS_NAME, --#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) -- DBUS_NAME_FLAG_DO_NOT_QUEUE, --#else -+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) - DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, -+#else -+ DBUS_NAME_FLAG_DO_NOT_QUEUE, - #endif - &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - if (dbus_error_is_set(&error)) { -@@ -1106,11 +1106,6 @@ - dbus_error_free(&error); - - if (server->bus) { --#ifdef HAVE_DBUS_CONNECTION_CLOSE -- dbus_connection_close(server->bus); --#else -- dbus_connection_disconnect(server->bus); --#endif - dbus_connection_unref(server->bus); - server->bus = NULL; - } -@@ -1127,11 +1122,6 @@ - assert(server->n_clients == 0); - - if (server->bus) { --#ifdef HAVE_DBUS_CONNECTION_CLOSE -- dbus_connection_close(server->bus); --#else -- dbus_connection_disconnect(server->bus); --#endif - dbus_connection_unref(server->bus); - server->bus = NULL; - } -@@ -1166,11 +1156,6 @@ - - fail: - if (server->bus) { --#ifdef HAVE_DBUS_CONNECTION_CLOSE -- dbus_connection_close(server->bus); --#else -- dbus_connection_disconnect(server->bus); --#endif - dbus_connection_unref(server->bus); - } - diff --git a/net-dns/avahi/files/digest-avahi-0.6.15 b/net-dns/avahi/files/digest-avahi-0.6.15 deleted file mode 100644 index e439c2d3dbef..000000000000 --- a/net-dns/avahi/files/digest-avahi-0.6.15 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 94dbd41336d18c47fc8213735a3fbf8e avahi-0.6.15.tar.gz 892455 -RMD160 c288d193f96751283065c4002d50ee139586e8b0 avahi-0.6.15.tar.gz 892455 -SHA256 21dc28f464dbf158ad15dc5ee9d0bad78215ef5633086e55b7201294d5841da0 avahi-0.6.15.tar.gz 892455 -- 2.26.2