From 6532d2921954ba67de991b1d0d6ff1092b0b2279 Mon Sep 17 00:00:00 2001 From: Bjarke Istrup Pedersen Date: Sat, 12 Nov 2011 09:49:40 +0000 Subject: [PATCH] Removing old versions and fixing public key install path. Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686 --- net-wireless/wireless-regdb/ChangeLog | 9 +++++- .../wireless-regdb-20091104.ebuild | 28 ------------------- .../wireless-regdb-20091125.ebuild | 28 ------------------- .../wireless-regdb-20101124.ebuild | 28 ------------------- ...uild => wireless-regdb-20110428-r1.ebuild} | 10 +++++-- 5 files changed, 15 insertions(+), 88 deletions(-) delete mode 100644 net-wireless/wireless-regdb/wireless-regdb-20091104.ebuild delete mode 100644 net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild delete mode 100644 net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild rename net-wireless/wireless-regdb/{wireless-regdb-20110428.ebuild => wireless-regdb-20110428-r1.ebuild} (78%) diff --git a/net-wireless/wireless-regdb/ChangeLog b/net-wireless/wireless-regdb/ChangeLog index ba63f8296b2b..ee27ce76598c 100644 --- a/net-wireless/wireless-regdb/ChangeLog +++ b/net-wireless/wireless-regdb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/wireless-regdb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/ChangeLog,v 1.20 2011/09/06 18:29:25 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/ChangeLog,v 1.21 2011/11/12 09:49:40 gurligebis Exp $ + +*wireless-regdb-20110428-r1 (12 Nov 2011) + + 12 Nov 2011; -wireless-regdb-20091104.ebuild, + -wireless-regdb-20091125.ebuild, -wireless-regdb-20101124.ebuild, + -wireless-regdb-20110428.ebuild, +wireless-regdb-20110428-r1.ebuild: + Removing old versions and fixing public key install path. *wireless-regdb-20110428 (06 Sep 2011) diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091104.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091104.ebuild deleted file mode 100644 index 91f925875634..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20091104.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20091104.ebuild,v 1.1 2009/11/04 14:53:52 chainsaw Exp $ - -inherit multilib - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing untouched binary version." -} - -src_install() { - insinto /usr/$(get_libdir)/crda/; doins regulatory.bin - insinto /usr/$(get_libdir)/crda/pubkeys; doins linville.key.pub.pem - doman regulatory.bin.5 - dodoc README db.txt -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild deleted file mode 100644 index 2569bf570bbc..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild,v 1.1 2009/11/26 11:46:13 chainsaw Exp $ - -inherit multilib - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing untouched binary version." -} - -src_install() { - insinto /usr/$(get_libdir)/crda/; doins regulatory.bin - insinto /usr/$(get_libdir)/crda/pubkeys; doins linville.key.pub.pem - doman regulatory.bin.5 - dodoc README db.txt -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild deleted file mode 100644 index 7ebd00e641c5..000000000000 --- a/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20101124.ebuild,v 1.1 2011/03/18 16:18:28 chainsaw Exp $ - -inherit multilib - -MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" -DESCRIPTION="Binary regulatory database for CRDA" -HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory" -SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing untouched binary version." -} - -src_install() { - insinto /usr/$(get_libdir)/crda/; doins regulatory.bin - insinto /usr/$(get_libdir)/crda/pubkeys; doins linville.key.pub.pem - doman regulatory.bin.5 - dodoc README db.txt -} diff --git a/net-wireless/wireless-regdb/wireless-regdb-20110428.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild similarity index 78% rename from net-wireless/wireless-regdb/wireless-regdb-20110428.ebuild rename to net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild index bc6f9329e7c8..9e94582d7615 100644 --- a/net-wireless/wireless-regdb/wireless-regdb-20110428.ebuild +++ b/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20110428.ebuild,v 1.1 2011/09/06 18:29:25 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20110428-r1.ebuild,v 1.1 2011/11/12 09:49:40 gurligebis Exp $ inherit multilib @@ -21,8 +21,12 @@ src_compile() { } src_install() { - insinto /usr/$(get_libdir)/crda/; doins regulatory.bin - insinto /usr/$(get_libdir)/crda/pubkeys; doins linville.key.pub.pem + insinto /usr/$(get_libdir)/crda/ + doins regulatory.bin + + insinto /etc/wireless-regdb/pubkeys + doins linville.key.pub.pem + doman regulatory.bin.5 dodoc README db.txt } -- 2.26.2