From: Ian Delaney <idella4@gentoo.org>
Date: Sat, 24 Oct 2015 02:23:05 +0000 (+0800)
Subject: app-misc/subsurface: reset slot/sub-slot to dep dev-libs/libgit2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bb2b2e13ad800e974b3921675c13d65f112987c5;p=gentoo.git

app-misc/subsurface: reset slot/sub-slot to dep dev-libs/libgit2

ack to 'zamabe' for submission of the patch via the gentoo bug
Re-set maintainer b-man to dev status in metadata

Gentoo bug: #537056

Package-Manager: portage-2.2.20.1
---

diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index aad9899cb748..b8135a4151e7 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>me@bearsh.org</email>
     <name>Martin Gysel</name>
     <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
   <maintainer>
-    <email>bauman.aaron@gmail.com</email>
+    <email>bman@gentoo.org</email>
     <name>Aaron Bauman</name>
-    <description>Proxy maintainer. Please CC bugs to him.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
   <longdescription lang="en">
     An open source dive log program.
   </longdescription>
diff --git a/app-misc/subsurface/subsurface-4.2.ebuild b/app-misc/subsurface/subsurface-4.2.ebuild
index 5f6437ac0fa7..51ab3c84d413 100644
--- a/app-misc/subsurface/subsurface-4.2.ebuild
+++ b/app-misc/subsurface/subsurface-4.2.ebuild
@@ -32,7 +32,7 @@ IUSE="debug doc usb"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
 	>=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
-	dev-libs/libgit2:=
+	dev-libs/libgit2:0/21
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/libzip
@@ -59,7 +59,7 @@ src_unpack() {
 }
 
 rm_trans() {
-	rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
+	rm "${D}usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
 }
 
 src_install() {
@@ -68,9 +68,9 @@ src_install() {
 	l10n_for_each_disabled_locale_do rm_trans
 
 	# this is not a translation but present (no need to die if not present)
-	rm "${ED}/usr/share/${PN}/translations/${PN}_source.qm"
+	rm "${D}usr/share/${PN}/translations/${PN}_source.qm"
 
 	if ! use doc; then
-		rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed"
+		rm -R "${D}usr/share/${PN}"/Documentation/* || die "rm doc failed"
 	fi
 }