From 82bc245350ed75865d0e0038197d0473b60daf52 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Thu, 10 Jun 2010 00:06:40 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- net-dns/dnsmasq/ChangeLog | 8 +- net-dns/dnsmasq/Manifest | 26 ++++-- net-dns/dnsmasq/dnsmasq-2.51.ebuild | 83 ------------------- ...nsmasq-2.50.ebuild => dnsmasq-2.55.ebuild} | 11 ++- 4 files changed, 31 insertions(+), 97 deletions(-) delete mode 100644 net-dns/dnsmasq/dnsmasq-2.51.ebuild rename net-dns/dnsmasq/{dnsmasq-2.50.ebuild => dnsmasq-2.55.ebuild} (82%) diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog index 8577214fa618..5d26876355fd 100644 --- a/net-dns/dnsmasq/ChangeLog +++ b/net-dns/dnsmasq/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dns/dnsmasq # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.196 2010/05/24 18:53:22 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.197 2010/06/10 00:06:40 chutzpah Exp $ + +*dnsmasq-2.55 (10 Jun 2010) + + 10 Jun 2010; Patrick McLean -dnsmasq-2.50.ebuild, + -dnsmasq-2.51.ebuild, +dnsmasq-2.55.ebuild: + Version bump. 24 May 2010; Pacho Ramos dnsmasq-2.52.ebuild: stable amd64, bug 316715 diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 78307a004a40..1b9b730abb2a 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -6,18 +6,26 @@ AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317 AUX dnsmasq-init 924 RMD160 feb28b270b5656834550e4dcfc1c87eeef88ab77 SHA1 119f112555a19236622637666758ef42d90ad74b SHA256 3803f1b7cb4c9f1c738537d5b5d91b37727572c81056e2fe6546a517ba992f55 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746 AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5 -DIST dnsmasq-2.50.tar.lzma 295295 RMD160 383976e5222755c636ea5c18a3c62ca7e674eff9 SHA1 3bfc67b54a10807676a91f611c4a357fac7ce54b SHA256 052377b13b31caf416988185688f5258ddbf9517313fa9796a8fcd0ff6c4bb39 -DIST dnsmasq-2.51.tar.lzma 298629 RMD160 5025fcbf5588670d0d5858b5e0165378c6530da3 SHA1 930d020eec18c540d63171efb10d17d25e13b51c SHA256 09d0a8a97f99d846161e2c286f495b4d4b9d423512a5c78834e934b9f16c4629 DIST dnsmasq-2.52.tar.lzma 304860 RMD160 38e05bfd746d618c0ac51ae245540b008474bde7 SHA1 5f4a7b52b3459a4f98ef25f3c95aef910c89dc21 SHA256 1f7834618181ef2a2feadb65a8a71e6fb75f5dfa07759df295726c2db765cca0 -EBUILD dnsmasq-2.50.ebuild 1675 RMD160 ec38e2664217fbad8e6490ecbf23183f7ed13343 SHA1 f62a2429640bbd900327f6440a6b6a2eb1fc4cef SHA256 06b0f4e67d092dfee7106d24831b77530f3db9fa4f00a3b3711e18f75c2942cd -EBUILD dnsmasq-2.51.ebuild 2013 RMD160 f2378011751420abedf364642745d3496ca4df0e SHA1 d4c9af6272626022e5b15701c12f5b4a13d542f8 SHA256 a55d3e4acb1ec0758f0cc3b8be254ccb6fcbc0be318e604307af4b6f2323c64e +DIST dnsmasq-2.55.tar.lzma 320116 RMD160 2e6f623da3f453a2c6086dc80315a9308a4245ef SHA1 0bd62b3846bad2ed5e243b1b8aae59c2e0e20da5 SHA256 ae36d8031640b3202d196170025ee13e6d9240cb6d523a2a3e4f7ab1289e1473 EBUILD dnsmasq-2.52.ebuild 1694 RMD160 4d928967afef64ec1594b2baf7413dfd4b283b18 SHA1 437cd3ff12d057e91b3694b5f65c569ac213ec1d SHA256 0a56e302f180cd748868836359863dc9f6f79efafdb433a4ea9361b749332b57 -MISC ChangeLog 25207 RMD160 d67cc4a67faa1f1e834168acbcf019dbd30c9a17 SHA1 4f1adc722be2a3cb0b8271e8197d78845f1cc458 SHA256 401d6a23cfd46fd588d2133224ce1616e7ce5d16bf0ca1b773515eea41ec9eb3 +EBUILD dnsmasq-2.55.ebuild 1708 RMD160 1241e8f1669ac238bddc64d6e812236d75339837 SHA1 7422beda23e52199c69f0e22e4c34548ab74871e SHA256 21acdbd49ef5ca57c6128a56ddc26c4ec27ce084b1b36c784d25c5d64e23e48d +MISC ChangeLog 25376 RMD160 9bad8bc5973e08662d56458b208860b912b94a64 SHA1 13c61feea340b09e664c83927ba2072f2e9690a9 SHA256 fbf4cff0a797ccef9ed59e7a86c69d7eb44fe48c8df41966131202b218c99d26 MISC metadata.xml 409 RMD160 059cae7fc03f12c391df3954a25b50b98f8fd616 SHA1 3b262afb2f3281150f03de7e7ee5019d1ddf3a32 SHA256 b8cb70c6cedee588056993ffa8a720fcb3248dc8d10bf6397910cf8fed07b4e2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkv6yykACgkQCaWpQKGI+9SQKACfUW2ysydMioBfLoEFnxVdDGhv -/NQAn3f6HoPeXwUSTGmqV2Zt7wR3LbOj -=3CuC +iQIcBAEBAgAGBQJMECynAAoJEHy/RO9cNQiDwr8P/jt+7pul5VuqgO1mREGKqibX +z9xEua1EZw3F4b9lRRz96IxiLKMOZCDFZTIulFocA1lFFPc682qNwl+0mReRLzpO +6clwKC1DiEg6tF9mLfQGXATmSSnBm94gMnLRfB0Krsd4e4epB1qF54LQkdrNPZMi +tIv6xaHYPJ7bDKGpNHNr6yY6eWscPtUj/7hcCpn5sKs7FDSLxVZFtLACge3LY99H +DzVSoK/AHzvHrAcR7ZWXVVT4LNuYgoAQD6li6MYUiDJfL0odkN4ab5FsOy5fqmeW +wVYJT3yVpJ47ZYv5uslU14eC7Za08B1Tuyrzg8hHVFMJRP/H0P+/1UhjBDayE3+l +QRkrdT7o7+DVskKAdmT+sef259QxBA7W+4rWc2r6Vpq1QGPApJ6WxPgSVGIOCFYs +b+B7qpxaq2nA4X4UpmjD6j+naFQAB+/2cdoHMCbvAD6G9Un9b/+V4Pt5T+FzMTK5 +3OWPCF7zvx1QxvGQSHs9MqK5UN4CyMPuLxXnfwtXwqe3+XpjO9diuxU2yUILXQyh +gUhriVekmpEhuZieLrB2uR9o+904S7alK/KLkN/czOXy5h9iN86+Clx2XsK5TWSE +ygmYWWdsP+FcPlTD2PBMc7bd7G0JXMIb3t7xW7bce6hZXmMdhGgBml0hZvhGakbe +Q9ixSxr6AyabWKCIU/yJ +=aIg7 -----END PGP SIGNATURE----- diff --git a/net-dns/dnsmasq/dnsmasq-2.51.ebuild b/net-dns/dnsmasq/dnsmasq-2.51.ebuild deleted file mode 100644 index 729868955966..000000000000 --- a/net-dns/dnsmasq/dnsmasq-2.51.ebuild +++ /dev/null @@ -1,83 +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/dnsmasq/dnsmasq-2.51.ebuild,v 1.3 2010/01/14 18:46:16 chutzpah Exp $ - -EAPI=2 - -inherit eutils toolchain-funcs flag-o-matic - -MY_P="${P/_/}" -MY_PV="${PV/_/}" -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/" -SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="dbus +dhcp ipv6 nls tftp" - -RDEPEND="dbus? ( sys-apps/dbus ) - nls? ( - sys-devel/gettext - net-dns/libidn - )" - -DEPEND="${RDEPEND} - || ( app-arch/xz-utils app-arch/lzma-utils )" - -S="${WORKDIR}/${PN}-${MY_PV}" - -pkg_setup() { - # quick-and-dirty workaround for bug #296204 until 2.52 comes out. - if use dbus; then - if ! use dhcp; then - eerror "Currently DBus support requires DHCP to be enabled. Please" - eerror "enable DHCP or disable DBUS (see bug #296204)." - die "DHCP required for DBUS support" - fi - fi -} - -src_prepare() { - sed -i '/^AWK/s:nawk:gawk:' Makefile #214865 - - # dnsmasq on FreeBSD wants the config file in a silly location, this fixes - epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch" -} - -src_configure() { - use tftp || append-flags -DNO_TFTP - use dhcp || append-flags -DNO_DHCP - use ipv6 || append-flags -DNO_IPV6 - use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h -} - -src_compile() { - emake \ - PREFIX=/usr \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - all$(use nls && echo "-i18n") || die -} - -src_install() { - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") || die - - dodoc CHANGELOG FAQ - dohtml *.html - - newinitd "${FILESDIR}"/dnsmasq-init dnsmasq - newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq - insinto /etc - newins dnsmasq.conf.example dnsmasq.conf - - if use dbus ; then - insinto /etc/dbus-1/system.d - doins dbus/dnsmasq.conf - fi -} diff --git a/net-dns/dnsmasq/dnsmasq-2.50.ebuild b/net-dns/dnsmasq/dnsmasq-2.55.ebuild similarity index 82% rename from net-dns/dnsmasq/dnsmasq-2.50.ebuild rename to net-dns/dnsmasq/dnsmasq-2.55.ebuild index 44d480c4d551..9ec5b20b3ac0 100644 --- a/net-dns/dnsmasq/dnsmasq-2.50.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.55.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.50.ebuild,v 1.8 2009/09/20 18:53:48 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.55.ebuild,v 1.1 2010/06/10 00:06:40 chutzpah Exp $ EAPI=2 @@ -14,11 +14,14 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="dbus +dhcp ipv6 nls tftp" RDEPEND="dbus? ( sys-apps/dbus ) - nls? ( sys-devel/gettext )" + nls? ( + sys-devel/gettext + net-dns/libidn + )" DEPEND="${RDEPEND} || ( app-arch/xz-utils app-arch/lzma-utils )" -- 2.26.2