[gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: ChangeLog dnsmasq-2.63.ebuild

[Patrick McLean (chutzpah)]

chutzpah    12/08/28 17:26:01

  Modified:             ChangeLog dnsmasq-2.63.ebuild
  Log:
  Make dnsmasq-2.63 respect LINGUAS and remove no-longer-necessary MY_* wrangling.
  
  (Portage version: 2.1.11.10/cvs/Linux x86_64)

Revision  Changes    Path
1.217                net-dns/dnsmasq/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.216&r2=1.217

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- ChangeLog	28 Aug 2012 17:11:42 -0000	1.216
+++ ChangeLog	28 Aug 2012 17:26:00 -0000	1.217
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.216 2012/08/28 17:11:42 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.217 2012/08/28 17:26:00 chutzpah Exp $
+
+  28 Aug 2012; Patrick McLean <chutzpah@g.o> dnsmasq-2.63.ebuild:
+  Make dnsmasq-2.63 respect LINGUAS and remove no-longer-necessary MY_*
+  wrangling.
 
 *dnsmasq-2.63 (28 Aug 2012)
 



1.2                  net-dns/dnsmasq/dnsmasq-2.63.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild?r1=1.1&r2=1.2

Index: dnsmasq-2.63.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.63.ebuild	28 Aug 2012 17:11:42 -0000	1.1
+++ dnsmasq-2.63.ebuild	28 Aug 2012 17:26:00 -0000	1.2
@@ -1,21 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild,v 1.1 2012/08/28 17:11:42 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild,v 1.2 2012/08/28 17:26:00 chutzpah Exp $
 
 EAPI=4
 
 inherit eutils toolchain-funcs flag-o-matic user systemd
 
-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.xz"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="conntrack dbus +dhcp idn ipv6 lua nls script tftp"
+DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
+for dm_lingua in ${DM_LINGUAS}; do
+	IUSE+=" linguas_${dm_lingua}"
+done
 
 RDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
@@ -30,8 +32,6 @@
 	virtual/pkgconfig
 	app-arch/xz-utils"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 REQUIRED_USE="lua? ( script )"
 
 use_have() {
@@ -91,6 +91,12 @@
 		DESTDIR="${D}" \
 		install$(use nls && echo "-i18n")
 
+	local lingua
+	for lingua in ${DM_LINGUAS}; do
+		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+	done
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+
 	dodoc CHANGELOG CHANGELOG.archive FAQ
 	dodoc -r logo