Adding workaround for .git directory in parent folder, fixing bug #482334

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x15AE484C

7 files changed, 49 insertions, 159 deletions

diff --git a/net-wireless/iw/ChangeLog b/net-wireless/iw/ChangeLog
index 723c036efbb5..ce38717e0665 100644
--- a/net-wireless/iw/ChangeLog
+++ b/net-wireless/iw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/iw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/ChangeLog,v 1.68 2013/06/26 11:57:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/ChangeLog,v 1.69 2013/09/01 17:40:18 gurligebis Exp $
+
+*iw-3.10-r1 (01 Sep 2013)
+
+  01 Sep 2013; <gurligebis@gentoo.org> -iw-3.3.ebuild, -iw-3.7.ebuild,
+  -iw-3.8.ebuild, +iw-3.10-r1.ebuild, -files/iw-3.2_libnl-3x-compile.diff,
+  +files/iw-3.10-versioncheck.patch:
+  Adding workaround for .git directory in parent folder, fixing bug #482334
 
   26 Jun 2013; Agostino Sarubbo <ago@gentoo.org> iw-3.10.ebuild:
   Stable for arm, wrt bug #474290
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index dc057df197cd..5778488d145b 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,31 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX iw-3.2_libnl-3x-compile.diff 1712 SHA256 ff702d9277368798754509b7bd7603006ac2efe2496c8a7eca9f2b379cd0de10 SHA512 2e542a79827802de6ab92c4d5681a1e5944038a6120b64f31b26bee19f3e2049bd87c96f6a95a76d197c6110bf2377cea353ad6685ef48b2b3c6b88285fa7e1e WHIRLPOOL 070576143c213a6e1da2ae5c78d8ad1b9a532cb9b8b07a5870a7b9cdd401c79ef2433949be49157f5343d92a7c3c13e6f261658421bb4df05c16eee22d526746
+AUX iw-3.10-versioncheck.patch 1005 SHA256 cf59e93813b89928d395079a5b88ed0953dd38b2441b26465446d444bc962199 SHA512 d2c49e142c1c44ed856a844727f1424abe46b3ee61fcce10290cd160d7a9267eaeb0be85ac5e1fe8446e230120708893f50410573912f30b4fcc41c6002d9041 WHIRLPOOL 5d8bbedeea4770d6afc6e5e2b7f724f90c91a16324cd440a75a9b65ce457ec71f0e336df12439d44b38260bc42e856f132f226708c2b3b41a10b758b7a0abe01
 DIST iw-3.10.tar.xz 80476 SHA256 456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9 SHA512 8cf38664b3eb9cfaf5c2c0c70376fc35d069eb4615af7c706253e9a111811be11c8d44d6c4205e8299db490dd9713faf4029ad2167a28f7305606e4683ac9f1b WHIRLPOOL f87cc344c994b0caa2731b073fa785f075af2be73608a82a1326078e4c3150a6dac69a99e1577129d696d80c38f6b33a89a2670c35a7ea58348ac5739e8b5b68
-DIST iw-3.3.tar.bz2 62245 SHA256 567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60 SHA512 fd240e0e365c25f1f5afabb52a3a08107e69910131d6dfae4331f97c4e3aa56c88f1c38c6ac43b247fc8186f0cc41ce0e10e89215b50ef8e67024d130cefc296 WHIRLPOOL 03eb5c83b396a0ffd357ca37b71588b834701b93f57df8f74d841358614a76ee334173a0128d3024c8644fad07c088ddb0b40b54de35e653d6eb15335087b4ed
-DIST iw-3.7.tar.bz2 66086 SHA256 2390785667a778ec4c3b2fa8bc89105ff775ada30203e76f2945b83619833224 SHA512 4cf480a977883f4abced1d5a23f883a40e0328531013076f3d0f0f241d13e3a8ce4de4aebdc5c386f768ab0dd9fecc497f419517bfef7e065735dca3a05e84a1 WHIRLPOOL 66da8276d0f21450009e4f42afb1c85d979c55a6541ea9a4f156adb75a7edc63af791525161031e79b52e29c7605485091ca14e6d1514a569a9af8e2ff15c9fb
-DIST iw-3.8.tar.xz 71724 SHA256 50c07d5fcf38240b3912fb6950f6ec566b8d27c321cbdacc1de53fc3be96af9a SHA512 267330b7f8ff2d3858e16782d6ad21f3b04fc62eccd44d5cad104946e1bdd4f3ea1ace40781c4e93d3b85d690f1a4cee3be1a10aa3ba1d036f8296453b8c346a WHIRLPOOL e77fd8580a4466122108ab4055da8d2e884179162f0f067ddf2ee91531711b1f852e35ee6615e36f863a1fc31dff66c124dce5aa1485eb35fc4af2ef2faa0ab6
+EBUILD iw-3.10-r1.ebuild 838 SHA256 a2f00163ddb058e186985ef7a7c51428d4d26164c3b9a445c8f47a8b5059b9fa SHA512 316a8575d516963298ad6f6d108b544a489b803215045c6d0475bf55517e6a4363a3eaba3870651664bad749af5085542bf40a955e2f2c429f14332d7e58d3e3 WHIRLPOOL faa5e4c80d67e75e671308a4f13cee84b89067094b87235cc1fd6e14b68c44ad0d96ccd6730e58eed3ee92e68dfb1b3e2f2cbe84840223ea0a79ecdf2def6c2a
 EBUILD iw-3.10.ebuild 771 SHA256 2b5cd72556738efba7cef943e636502e96a881350ede904b54c8870292ca105d SHA512 1cfdf8286f7afea5e1ecd3c78204a8018436c18ab5cef930cda4838f966cbaefd012637ed61a26215ead91d7f81481373c841068f84d9ed744c5f1229f8afb5e WHIRLPOOL 359c9e56cb36c17554d54f75c0a6d96653b4da7d8416dfef240f4ff48edeb3f4a4e21741a19b805c62da93615f9f0c681dfab02dea290e80799ebe7dcb0ee3c4
-EBUILD iw-3.3.ebuild 752 SHA256 1ef9f6e83896c5adca6cf3ff9a18e01afc7610b82cf691a8c1f2ee3767f55e35 SHA512 f970b0d74f429eb2a1065fc54534742680ba6815e4ff3d8752ead8aee4e13bd26c3aae19bb95060166b3edb90853a3d677fbf9c7a4f8054a59a9a76c10f11bec WHIRLPOOL 95f06b67bacfdc83c284b1938181d806fb1fa431989c92bd669a11b3566bcb5805c707b3985698e433286f223d694c813956d381c6fb94e1d618a55218d46bf9
-EBUILD iw-3.7.ebuild 771 SHA256 399a756317ab4baa6b568c9fe7e6f471057798013bd9a33df9fa44cc58217294 SHA512 eee04497bdb0f64de3f1759d0964d0535aa7ef8d5417b7aa97f63ed5d2e06644d6cc66ec37f2b562c5839ca1b1b2a33632e01f87f9bf6e6bde87eef964e5ce94 WHIRLPOOL 1f99269502346de1cf5a9bfd530c45be99803b8bfb3920db3b9fc5d9620debaffa0afc31d3a1e3712e142faf1036b8945a5e6d829835c38a328f33fe45731441
-EBUILD iw-3.8.ebuild 780 SHA256 8e9ddac40e9fff4879f4d3a4222c139be837762cf265b7db678c931f0ca4f683 SHA512 802ec1c94fe3bf406829296881a2706651ad10a1ca92f56be46671a409d51621edd3be61faa787066dac8573baf66faa2c9d747f842424a35dccb8ad14f08c7b WHIRLPOOL e76a37db714bbbeb6c45554e58d8d0b8cb98c02925d0b68e0b2f21580c9a3cc5e46296328837b6ab02f032673b1e5673a9f9f1d2d178716692a4ee5e3d7e186f
-MISC ChangeLog 9075 SHA256 9072013f9439a9d9c55c6759e3cf7fe15f77e2f4812227ad65188ea5db616853 SHA512 0727cadc4d16063654940af61fd4d10d5d2635e745362b2020afa0136e3212602850e82d3307ebcf910ff2e527fdf09fdc8d242ddb9637a734f9c50c5b3e0b48 WHIRLPOOL 406b211e494d34046c7cc8513f1357d8aeecb4f449ae7bcdedf4012fdb8228e473a70f0811e0de88e9bb13479bda018fea4ea70d8893c4a69644c2b917cffff4
+MISC ChangeLog 9369 SHA256 580d1715ac9b1b3fd566db3e13f3cc27e34ad021b88e41f06e689ac65a8a0b32 SHA512 85bf89ab8df73591972b6b50ddf00d452d8ef5e962a3933b95153ec991dc0ab4f4ed063c922d5bd8bac61859a930387cb0593c0c448666a97fd26bb231ca532c WHIRLPOOL 2017d64313e0359a3e5ce85b6d3ec413582c7830e2e748e0632b984ddc57c21426195d335741f56b7902f4bae47dec50c6c862a0655a4b3efd3e3c1763a5fd48
 MISC metadata.xml 422 SHA256 3745b3cf596b583b3dc86302d65e5ff8c76dd8e2b1da7e02e4d46dcc161bc220 SHA512 530ddd8a6421db8c4002ca0c839fece228475bd37491b22a592e1b8faa274c0a8cc66f8ec31ca322b300d72416b3ee04d9c27ef000f0c2febb89250f3d76c5b3 WHIRLPOOL 2be80400068cf69ca929800804cb1a139db6ff5ea8d5d2292484583200580b61a297f90bbd37b03e8e06e79b9fc44baf4e7edda9d0228d0a90c4756fda474940
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRytZ1AAoJELp701BxlEWftygP/jM5aJcKegFUsEvDEQ7h5/uM
-xtV18qA55G6loRISA4YEfChpygVN5EgNNF4IDoSfuDy/qQeLD7vRZ/vDTTH+hVVY
-btuA7/dJZ9999OgMXu3t6OlpfXkS/K7leTl/qv9Icm6FwcrEk82jtgVsjjclb6tn
-VP1QA4aXB63qiOiIFdfuJghxZglIKzAdv8vSD+PD8hArA6rn8wxGcFGrC8F4U+j2
-9CZBPCypnXpj1lD5WyHzUfmvf/n9hFG4bo/2AZHlAyFQh86GdnnCZYZes+xuCf4m
-50VTZYXSBUYxCROmhHETPTKezSHVoNUqfQhXvzaQRyX96q+8DbDAZK4qgvG4Vur2
-+sB+iNW7zenLPqjOZiWHtSyqQePKRY+6Ly3zmzVSDcMQeJG1RQYh2mSKGow7WmcV
-slTnqspmJ+KcN0SbEueIGNFXIARWHSp5S208GMED1Z2buNVhJobVtOz0/mop9Kux
-H/vCodwRXThLHZkgh66/vqVN50Y93xxuqAaLksx4Wbu7QSPseH/D6kgh4W6YqiCj
-5A4GXkopyEPm23Vdl108Bdxj/dTmi7wpquvwTXx1iM01QcEMAb29/neLvSf69yA9
-tAOMhZaujSLgeN40slrjS6yKIXdbEqvIpegOtSbq3SZUJ6UoCcdAahpfy5rHCq20
-hKdnxQXZ0KPCe7DppuVE
-=rmlD
+iEYEAREIAAYFAlIjfAMACgkQsR7PQhRXYEndwACeJocBW68ZdVSVGJ6qB7c5ZI4J
+zTcAnRp7QiBGgcRsXNPPUp3siR6T+fiv
+=VHxy
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/iw/files/iw-3.10-versioncheck.patch b/net-wireless/iw/files/iw-3.10-versioncheck.patch
new file mode 100644
index 000000000000..a15931f5865f
--- /dev/null
+++ b/net-wireless/iw/files/iw-3.10-versioncheck.patch
@@ -0,0 +1,30 @@
+From 2b60b435dd032572c556b064295a3e3607d00a55 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <fschmaus@gmail.com>
+Date: Sun, 1 Sep 2013 17:57:21 +0200
+Subject: [PATCH] Don't get iw version from git if there is no .git/
+
+The version.sh script should only try to get the version from git if the
+source actually resides in a git repository, i.e. .git/ exists. Doing
+otherwise in a non-git source repo results in git ascending until it
+finds a .git directory, which will cause problems in some source-based
+distributions ( https://bugs.gentoo.org/show_bug.cgi?id=482334 ).
+---
+ version.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/version.sh b/version.sh
+index 80e55ab..0f1aa1d 100755
+--- a/version.sh
++++ b/version.sh
+@@ -3,7 +3,7 @@
+ VERSION="3.11"
+ OUT="$1"
+ 
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
+ 	git update-index --refresh --unmerged > /dev/null
+ 	descr=$(git describe)
+ 
+-- 
+1.8.1.5
+
diff --git a/net-wireless/iw/files/iw-3.2_libnl-3x-compile.diff b/net-wireless/iw/files/iw-3.2_libnl-3x-compile.diff
deleted file mode 100644
index 199fc20a0161..000000000000
--- a/net-wireless/iw/files/iw-3.2_libnl-3x-compile.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -aurp old/Makefile new/Makefile
---- old/Makefile	2011-11-04 10:53:29.000000000 +0000
-+++ new/Makefile	2011-11-14 09:30:04.514995618 +0000
-@@ -25,6 +25,8 @@ ALL = iw
- NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
- NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
- NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
-+NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
-+NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
- 
- ifeq ($(NL1FOUND),Y)
- NLLIBNAME = libnl-1
-@@ -36,18 +38,34 @@ LIBS += -lnl-genl
- NLLIBNAME = libnl-2.0
- endif
- 
-+ifeq ($(NL3xFOUND),Y)
-+NL3FOUND = N
-+CFLAGS += -DCONFIG_LIBNL30
-+LIBS += -lnl-genl-3
-+NLLIBNAME = libnl-3.0
-+endif
-+
- ifeq ($(NL3FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
- LIBS += -lnl-genl
- NLLIBNAME = libnl-3.0
- endif
- 
-+# nl-3.1 has a broken libnl-gnl-3.1.pc file
-+# as show by pkg-config --debug --libs --cflags --exact-version=3.1 libnl-genl-3.1;echo $?
-+ifeq ($(NL31FOUND),Y)
-+CFLAGS += -DCONFIG_LIBNL30
-+LIBS += -lnl-genl
-+NLLIBNAME = libnl-3.1
-+endif
-+
- ifeq ($(NLLIBNAME),)
- $(error Cannot find development files for any supported version of libnl)
- endif
- 
- LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
- CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
-+NLVERSION :=$(shell $(PKG_CONFIG) --print-provides $(NLLIBNAME))
- 
- ifeq ($(V),1)
- Q=
-@@ -57,20 +75,7 @@ Q=@
- NQ=echo
- endif
- 
--all: version_check $(ALL)
--
--version_check:
--ifeq ($(NL3FOUND),Y)
--else
--ifeq ($(NL2FOUND),Y)
--else
--ifeq ($(NL1FOUND),Y)
--else
--	$(error No libnl found)
--endif
--endif
--endif
--
-+all: $(ALL)
- 
- VERSION_OBJS := $(filter-out version.o, $(OBJS))
- 
diff --git a/net-wireless/iw/iw-3.8.ebuild b/net-wireless/iw/iw-3.10-r1.ebuild
index 1bffda94d08f..67b9a66ee72d 100644
--- a/net-wireless/iw/iw-3.8.ebuild
+++ b/net-wireless/iw/iw-3.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.8.ebuild,v 1.4 2013/02/08 16:06:16 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.10-r1.ebuild,v 1.1 2013/09/01 17:40:18 gurligebis Exp $
 
 EAPI=5
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
 HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	tc-export CC LD
+	epatch "${FILESDIR}/${P}-versioncheck.patch"
 }
 
 src_compile() {
diff --git a/net-wireless/iw/iw-3.3.ebuild b/net-wireless/iw/iw-3.3.ebuild
deleted file mode 100644
index 146beb3cf0b5..000000000000
--- a/net-wireless/iw/iw-3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.3.ebuild,v 1.8 2012/12/16 21:10:08 zerochaos Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-}
diff --git a/net-wireless/iw/iw-3.7.ebuild b/net-wireless/iw/iw-3.7.ebuild
deleted file mode 100644
index 0de37b093e29..000000000000
--- a/net-wireless/iw/iw-3.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.7.ebuild,v 1.6 2013/02/08 16:06:16 zerochaos Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="http://wireless.kernel.org/en/users/Documentation/iw"
-SRC_URI="http://linuxwireless.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	tc-export CC LD
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}