Cleanup.

Package-Manager: portage-2.2.0_alpha18/cvs/Linux x86_64

5 files changed, 8 insertions, 467 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index bdf4ee9d5244..a7d92dd14596 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.190 2010/12/14 00:27:52 swegener Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.191 2011/01/23 20:20:36 swegener Exp $
+
+  23 Jan 2011; Sven Wegener <swegener@gentoo.org> -avahi-0.6.24-r2.ebuild,
+  -files/avahi-0.6.24-CVE-2009-0758.patch, -avahi-0.6.25.ebuild:
+  Cleanup.
 
   14 Dec 2010; Sven Wegener <swegener@gentoo.org> avahi-0.6.27.ebuild,
   avahi-0.6.27-r1.ebuild, avahi-0.6.28.ebuild:
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
deleted file mode 100644
index 586aed8fba99..000000000000
--- a/net-dns/avahi/avahi-0.6.24-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.14 2010/05/19 19:14:47 arfrever Exp $
-
-EAPI="1"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils mono python multilib autotools 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 ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt4 autoipd kernel_linux test ipv6"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( x11-libs/qt-core:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			|| (
-				dev-python/dbus-python
-				(
-					<sys-apps/dbus-0.90
-					>=sys-apps/dbus-0.30
-				)
-			)
-		)
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	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
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python
-	then
-		python_set_active_version 2
-	fi
-
-	if use python && ! built_with_use "=dev-lang/python-2*" 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
-
-	if use python && ! use dbus && ! use gtk
-	then
-		die "For proper python support you also need 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
-	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-
-	rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
-
-	epatch "${FILESDIR}"/avahi-0.6.24-CVE-2009-0758.patch
-	epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
-	epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	use sh && replace-flags -O? -O0
-
-	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 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) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-	emake || die "emake failed"
-
-	use doc && emake avahi.devhelp
-}
-
-src_install() {
-	emake install py_compile=true 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 /$(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}
-
-	if use doc
-	then
-		dohtml -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-
-	if use autoipd
-	then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-
-	if use dbus
-	then
-		elog
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.25.ebuild b/net-dns/avahi/avahi-0.6.25.ebuild
deleted file mode 100644
index 92d55563a341..000000000000
--- a/net-dns/avahi/avahi-0.6.25.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.6 2010/05/19 19:14:47 arfrever Exp $
-
-EAPI="1"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils mono python multilib autotools 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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt4 autoipd kernel_linux test ipv6"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( x11-libs/qt-core:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.4.0
-		>=gnome-base/libglade-2.4.0
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30
-		python? (
-			|| (
-				dev-python/dbus-python
-				(
-					<sys-apps/dbus-0.90
-					>=sys-apps/dbus-0.30
-				)
-			)
-		)
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	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
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python
-	then
-		python_set_active_version 2
-	fi
-
-	if use python && ! built_with_use "=dev-lang/python-2*" 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
-
-	if use python && ! use dbus && ! use gtk
-	then
-		die "For proper python support you also need 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
-	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-
-	rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
-
-	epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
-	epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	use sh && replace-flags -O? -O0
-
-	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 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) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-	emake || die "emake failed"
-
-	use doc && emake avahi.devhelp
-}
-
-src_install() {
-	emake install py_compile=true 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 /$(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}
-
-	if use doc
-	then
-		dohtml -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize $(python_get_sitedir)/avahi $(python_get_sitedir)/avahi_discover
-	fi
-
-	if use autoipd
-	then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-
-	if use dbus
-	then
-		elog
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch b/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
deleted file mode 100644
index 578839364c62..000000000000
--- a/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index 453db09..8187690 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -844,7 +844,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
-         if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0)
-             avahi_log_warn("getsockname(): %s", strerror(errno));
-         else
--            return lsa.sin_port == port;
-+            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
- 
-     }
- 
-@@ -855,7 +855,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
-         if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0)
-             avahi_log_warn("getsockname(): %s", strerror(errno));
-         else
--            return lsa.sin6_port == port;
-+            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
-     }
- 
-     return 0;
diff --git a/net-dns/ez-ipupdate/Manifest b/net-dns/ez-ipupdate/Manifest
index 3eace1bddf73..161ba77cf41c 100644
--- a/net-dns/ez-ipupdate/Manifest
+++ b/net-dns/ez-ipupdate/Manifest
@@ -10,8 +10,6 @@ DIST ez-ipupdate_3.0.11b8-10.diff.gz 58420 RMD160 916da2553c2901bae62de43a09ee4a
 DIST ez-ipupdate_3.0.11b8-13.3.diff.gz 154094 RMD160 8d30768872fd5579b8cb0f671d2e6f756e1605d7 SHA1 800aec0da7313301e71897b5d37492616808db57 SHA256 2c058941f8b172c8564d841d4413b7fa7a5c4dbd53d7d5574c2ff58f41cf39b3
 DIST ez-ipupdate_3.0.11b8.orig.tar.gz 81975 RMD160 f193969c5d3c9faa1b6fec41d530557614d62c55 SHA1 bcb0b919067bb235bd195936e85ceca90b4323c0 SHA256 bf5b8d11ffe055c5891d0ab64bbfa86e99cbda645d40f346146b939fec8d962d
 EBUILD ez-ipupdate-3.0.11.13.3_beta8.ebuild 3569 RMD160 62670b1eb74d3ee4e71916565ae1dbd78fd1ac23 SHA1 42d70fdc5cb1d5513de859673d6467cf71764954 SHA256 a1d40d26b8618249162c33c850caa479ba22b31d55ff792586ef664003c65dd3
-EBUILD ez-ipupdate-3.0.11_beta8-r4.ebuild 2915 RMD160 c79ee8485310c98f72d7475a6afdae26ab68b0b6 SHA1 a894fa3be430c2284d46c6ab6967a38f113239ca SHA256 02ed7966973c2d616aaf6c653655a440bd4e985affd83b68eaf9c170b2c5d310
-EBUILD ez-ipupdate-3.0.11_beta8-r5.ebuild 2960 RMD160 98c2e6d2c447823a6ad1aea1903b46668588e4c1 SHA1 00d3c208b6ebeccd7c8a9eda7711e28b2cfe9485 SHA256 79a017ef288602dd9d4b5a6be4b7b1b6337f981d38d5cd0aaec492c82b99a50c
-EBUILD ez-ipupdate-3.0.11_beta8-r6.ebuild 3008 RMD160 47de6b8d1bb102e85aa4ccef05d9f50d7eb75158 SHA1 974b5c0026a9903294db7e43e204cabc3f64754c SHA256 13b1525cc12f98777c85739df41600e797d80e5033684ff7b75900b582b9b748
-MISC ChangeLog 6302 RMD160 89a04e6be201758c71f5a7c87415cfe947dfacf7 SHA1 212f15004ee5b93cb03fe944a4e3a5c80e35c513 SHA256 9f513c7a6ba8d2d41805ada2bb6ca70d77618242cde2d2dcfb8ad21fb27e34f0
+EBUILD ez-ipupdate-3.0.11_beta8-r6.ebuild 3018 RMD160 acd72fbb38c761b6d1d9774f8b1dc5c4463bdfed SHA1 18ea53243fad26119e4ca591e1c267b5ef3a7400 SHA256 5093e2f0654a9c5ee05590688e76d84e32be56ae934f879ca1dcb7312b45a124
+MISC ChangeLog 6511 RMD160 e0f1454b1ca8a85d36adb58cc7de0e46f6eef0ca SHA1 370556ee4c206f0307997879f73bc447a569470f SHA256 cd662a42eaa8e361b0295080dae89e8de40660b6b4178f3b50b6ff1f42d4f610
 MISC metadata.xml 497 RMD160 92b0aae309f59fbe7ae0c6359355aa2abf0308a9 SHA1 203ae4e8d9abea53e4c54ee8dfa8594737991dfa SHA256 9d9ae7d8782c5eedfef88238baa233c1c2ed7c6832ba7ed6a6328bddf41699ba