can't say I'm proud, but this is about as clean as I can get it, and it works

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 32 insertions, 41 deletions

diff --git a/sys-fs/go-mtpfs/ChangeLog b/sys-fs/go-mtpfs/ChangeLog
index 78c00f34040a..c87fdeea0265 100644
--- a/sys-fs/go-mtpfs/ChangeLog
+++ b/sys-fs/go-mtpfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/go-mtpfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/go-mtpfs/ChangeLog,v 1.4 2014/01/23 17:16:38 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/go-mtpfs/ChangeLog,v 1.5 2014/01/28 01:13:50 zerochaos Exp $
+
+  28 Jan 2014; Rick Farina <zerochaos@gentoo.org> go-mtpfs-9999.ebuild:
+  can't say I'm proud, but this is about as clean as I can get it, and it works
 
   23 Jan 2014; Rick Farina <zerochaos@gentoo.org> go-mtpfs-9999.ebuild:
   horrible, horrible update, that happens to build on hardened
diff --git a/sys-fs/go-mtpfs/Manifest b/sys-fs/go-mtpfs/Manifest
index 3a7724462c88..c1d4a3c6f8cf 100644
--- a/sys-fs/go-mtpfs/Manifest
+++ b/sys-fs/go-mtpfs/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-EBUILD go-mtpfs-9999.ebuild 1581 SHA256 b22feaa2605f7cb84127b630850fb2e1ca69a107a311f141b65834316eb9316d SHA512 3ee2e8672ba67bcf6421ec2c500097501ff6912c822ed5962ee7239793bcc8eb0eec44332f739472d1b521ab583d6903ee8e8eaaa76498d6afd9a02125e53374 WHIRLPOOL aa753a006669f966e3f7736a75802024eeb5a95430feee7a42b22d3b91a3d4e9dbe6567a86492a45d4c1c415c0184232ad5c576d481d11efc079dd5aca3aaf6b
-MISC ChangeLog 737 SHA256 6d036334b30f819396a9e7eda0e9a6fff1449be737cd4fbe5f42b3ee5ae1b36f SHA512 b537c55d30b2a8d5200f6c9148040b3e4e64af9c4531fa57b1dd33b3e1d52d3202bd1a29ad217b67dc53870885c14d93aaeaab247195dc44887916fb6c7cd515 WHIRLPOOL 1b3139d05e6fde19572e80f51ad044eb2cc01b1b5627605e7f4d836f75d775d1a0291e092c55ed45951bb7f2ba11fb707d53f2cdf1af601c1696bf730d3682ff
+EBUILD go-mtpfs-9999.ebuild 1159 SHA256 85bb1033ceea4d0906d6624f5f02bcc907b78966e35ff35e9196bae98a0575fa SHA512 ceb7694bfb8155ccf346a88475ae53fdab848c937f7edccf7a4ab54b4be866349e382722f56b45bbf5398a616cc27a484806bd38a8113968773a7f7e2176fe3d WHIRLPOOL b71cb0e8059b28680cc669d4defb7cac3ef6a6600f28d4611841aa04de682b394583c68beb7ca19c26ed2fb7e8aa9a4838d0775ced3736cd2e660a03ea98f432
+MISC ChangeLog 890 SHA256 2a327554dd22bfeb1b2a16878e1c193c07071ca1a6a39347baca1c62009bdca1 SHA512 e3837853512014173927cb2b54fc0833d1bed8d306cf0b65b1489d113965349535ec950ef53d425d7291c27d27f61301bc3682812c741f601cb9d96d48b2424d WHIRLPOOL 75a4c0eeb2663100d7353d3875692b92fb84ef24ce422e9835e8e42fe01b909a51be8da22d99906f4af9cdec90c402e902cdd63481a8144594652d88457412ef
 MISC metadata.xml 274 SHA256 fcdb6e69f3adb718ed543a83635badf4e360a57c550760997c4c5f8ea5c7193a SHA512 8b3d3358fe15d41a5bae960eb75727923c05bab81f63ab6cbab1134e9f49fe69c7e710edf051765950c57a2ef0025207d5f7c129b2bdccfca5be3ec042cf458e WHIRLPOOL 152e28545dc06eb18012d2545644b8bd223c546d10524a7c879573fb1ad265d75ff1ae8e3a95ee6777dbff155ff4ab6795841a884d3dd722579fa8ed5fa6bb49
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS4U6eAAoJEKXdFCfdEflKJA0P/1krLTqR1z60K9rVVxOoHfrc
-SYA5X46RpVyA4ztCNT6JE5VZHCbuZoMXdFeWWoG2tprz8RwUsFucxdpl71VK4SJ0
-oe4ElenGDofe4OfcaamTo4oWGQX66HduP+KfSdt46CidjAGVGndW0gSI8bZHpaLF
-vQU21513Jl4fLX3mvMLHs5RJi12wR8Tiwx6avHtHQmWq1Gqo2tb7lW5XzFF0nefn
-+tpnfMacKYL3QYE0UBwFwbakbDd8/6DXgHXM5TEO/qa0m8nWbjJls4gFUNkuFQv/
-LKUqD/xyXw4azFNcd/K/sBcNY8VH7V/VkJ5xDk61MsiZYylhcr/1wzd0UPWjYC0C
-ZSyQZIPccAdwyWfMtABjsA5AZZzsCz+QChBnkrj8fP2vlcnynhnFHMw7K7Cz/fQb
-GVPQ4jGY7xKtlbwi5tGgVhy1E+CJ1s18K0FWGy3lg9D1FqZSegnoB8GtMRSV/Huu
-yBbgxKI1PcBOBAyPzDwWwaAlbU8Lb0xqgxAe+Dp0MLSppt18R5Ct06CMDyhBL1TX
-nfUKsA9GKIPFfOyuFm2sGaurCz8f3gIn3MOLiB9VdaBsZF5P6GOHWQAMgAR+YCkr
-5fNYE/YgSKlwAQy6Wv/gu0Hwj6Y+5jYE87Xi1U0bxjRGEEbQZ/hr6WbkaWgltyRv
-IT41jQO3QSFR7tEadInt
-=7y30
+iQIcBAEBCgAGBQJS5wSDAAoJEKXdFCfdEflKat8QAIUlBlQNsScqwPthynhg0IJB
+FYI1x8IN4suawfY/cs6Y5cIex4JlN941wbfmGglSuj+4Q7sNMbnY0ZtDvTRpugIp
+EsltolzRYiS27ty2sjEU5dXernE86ndMMvTbnpiozWJSDPP0bwR7dO5x5oO8LyXn
+4E4ME0Hbix34HewSEopzxxVcIlt8hEiaxiossV/1idYomkaZxXZKk9Gt1kASm1sx
+KosKK/ryegPylMNIOqRII5LIulPubjjW7qok7nx7hDPPz0jl8eIBimj+oaD9kMca
+ga4XZnm4kpLUrXHlDC9nNnKhmcmG29XMcU9R8NqC6Ok3r1iwq6Aqyf8emqzXxZRh
+IyrLgYtIvg1/iw+vABpZ07OIVPc4gL8JK36nNLCFAeillCF0etx1wCB46yd5DLon
+KH6b0RAPElRM+PNWO0BnRhbFks/aSMX4M6gIjX0XfMNhQ5VO7RsBJrcvfahoRbRo
+KaJQTsCf33nrXEEdu4zK92KxkPZ9Ets2VMueIaFkE3AoaJQ/LslYyoiHns5agztI
+/WkBwFKbNKySQSo5Mn11sbzGpNcQqPSvHTINTZEdPQ/zGANFGFRIEb5B7ymz7ihF
+DuU5l96GbnxP2gDNwz58VuKQFQ3Os5mLcXNkaTVSovsWtBn+LohuhX8IS8YiNB6+
+EBw2Qprk3Moh2CBMWw7N
+=gUW6
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild b/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild
index b4795b075432..e0f57bde7b5c 100644
--- a/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild
+++ b/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild,v 1.4 2014/01/23 17:16:38 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild,v 1.5 2014/01/28 01:13:50 zerochaos Exp $
 
 EAPI=5
 
@@ -16,45 +16,33 @@ KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="virtual/libusb
-		media-libs/libmtp"
+		virtual/udev"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/go-fuse
-	dev-lang/go"
+	dev-lang/go
+	media-libs/libmtp"
+
 RDEPEND="${COMMON_DEPEND}"
 
+#Tests require a connected mtp device
+RESTRICT="test"
+
 GO_PN="github.com/hanwen/${PN}"
 EGIT_CHECKOUT_DIR="${S}/src/${GO_PN}"
+QA_FLAGS_IGNORED=usr/bin/go-mtpfs
 
 export GOPATH="${S}"
-export GOGCCFLAGS="${CFLAGS}"
-
-#pkg_setup() {
-#}
 
 src_compile() {
-	#if gcc-specs-pie ; then
-	#	filter-flags -fPIE
-	#	append-ldflags -nopie
-	#fi
-	go build -ldflags '-nopie' -v -x -work ${GO_PN}/fs || die
-	go build -ldflags '-nopie' -v -x -work ${GO_PN}/usb || die
-	go build -ldflags '-nopie' -v -x -work ${GO_PN}/mtp || die
-#works on hardened up to here
 	go build -ldflags '-extldflags=-fno-PIC' -v -x -work ${GO_PN} || die
 }
 
 src_test() {
-#none of this works on hardened
-	go test ${GO_PN}/fs || die
-	go test ${GO_PN}/usb || die
-	go test ${GO_PN}/mtp || die
+	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN}/fs || die
+	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN}/usb || die
+	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN}/mtp || die
 }
 
 src_install() {
-#	go install -v -x -work ${GO_PN}/fs || die
-#	go install -v -x -work ${GO_PN}/usb || die
-#	go install -v -x -work ${GO_PN}/mtp || die
-	go install -ldflags '-extldflags=-fno-PIC' -v -x -work ${GO_PN} || die
+	dobin go-mtpfs
 }
-
-#please don't remove commented lines till it works in hardened