public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/subsurface/
@ 2015-10-24  2:24 Ian Delaney
  0 siblings, 0 replies; 3+ messages in thread
From: Ian Delaney @ 2015-10-24  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     bb2b2e13ad800e974b3921675c13d65f112987c5
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 02:23:05 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 02:24:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb2b2e13

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

 app-misc/subsurface/metadata.xml          | 5 ++---
 app-misc/subsurface/subsurface-4.2.ebuild | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index aad9899..b8135a4 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 5f6437a..51ab3c8 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
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/subsurface/
@ 2015-10-25  4:24 Aaron Bauman
  0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2015-10-25  4:24 UTC (permalink / raw
  To: gentoo-commits

commit:     ee912cfc092f30a34c5ae0fde0f735eafeac86be
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 04:23:47 2015 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 04:23:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee912cfc

app-misc/subsurface: drop proxy-maintainer

Package-Manager: portage-2.2.20.1

 app-misc/subsurface/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index b8135a4..84651c1 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -7,10 +7,6 @@
     <name>Martin Gysel</name>
     <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
-  <maintainer>
-    <email>bman@gentoo.org</email>
-    <name>Aaron Bauman</name>
-  </maintainer>
   <longdescription lang="en">
     An open source dive log program.
   </longdescription>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/subsurface/
@ 2019-11-19 18:33 Robin H. Johnson
  0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2019-11-19 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9ec1ac7b4ba71cdc445ebd8a37943720a7ede6d8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 19 18:32:01 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 19 18:33:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec1ac7b

app-misc/subsurface: remove again, partial revert of 37c8aacd953514d585134f7cf10a88fb25abfdf4

Package-Manager: Portage-2.3.78, Repoman-2.3.17
RepoMan-Options: --force
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-misc/subsurface/metadata.xml            | 11 -----
 app-misc/subsurface/subsurface-4.9.3.ebuild | 77 -----------------------------
 2 files changed, 88 deletions(-)

diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
deleted file mode 100644
index bdfb432dee4..00000000000
--- a/app-misc/subsurface/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
-			Scuba dive planner
-	</longdescription>
-</pkgmetadata>

diff --git a/app-misc/subsurface/subsurface-4.9.3.ebuild b/app-misc/subsurface/subsurface-4.9.3.ebuild
deleted file mode 100644
index ff7ff60a69d..00000000000
--- a/app-misc/subsurface/subsurface-4.9.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.9 2015/06/04 19:00:13 kensington Exp $
-
-EAPI="5"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Subsurface-divelog/subsurface.git"
-	GIT_ECLASS="git-r3"
-	KEYWORDS=""
-	SRC_URI=""
-	LIBDC_V="9999"
-else
-	MY_P=${P/s/S}
-	SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz"
-	KEYWORDS="~amd64 ~x86"
-	LIBDC_V="0.6.0"
-fi
-
-PLOCALES="bg_BG da_DK de_CH de_DE el_GR en_GB es_ES et_EE fi_FI fr_FR he hu it_IT
-	lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sv_SE tr zh_TW
-"
-
-inherit eutils l10n qt4-r2 ${GIT_ECLASS}
-
-DESCRIPTION="An open source dive log program"
-HOMEPAGE="http://subsurface.hohndel.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc usb"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	>=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
-	dev-libs/libgit2:=
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/libzip
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	kde-apps/marble:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
-"
-
-DOCS="README"
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-		mv ${MY_P}* ${P} || die "failed to mv the files to ${P}"
-	fi
-}
-
-rm_trans() {
-	rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
-}
-
-src_install() {
-	qt4-r2_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"
-
-	if ! use doc; then
-		rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed"
-	fi
-}
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-11-19 18:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-24  2:24 [gentoo-commits] repo/gentoo:master commit in: app-misc/subsurface/ Ian Delaney
  -- strict thread matches above, loose matches on Subject: below --
2015-10-25  4:24 Aaron Bauman
2019-11-19 18:33 Robin H. Johnson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox