dev-vcs/rapidsvn: Version Bump, #436412; remove prereleases; honor LINGUAS, #406409

(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)

4 files changed, 60 insertions, 9 deletions

diff --git a/dev-vcs/rapidsvn/ChangeLog b/dev-vcs/rapidsvn/ChangeLog
index 0a2af66018ad..d29878537f1b 100644
--- a/dev-vcs/rapidsvn/ChangeLog
+++ b/dev-vcs/rapidsvn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/rapidsvn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.16 2012/10/07 09:00:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.17 2012/10/07 11:20:26 jlec Exp $
+
+*rapidsvn-0.12.1 (07 Oct 2012)
+
+  07 Oct 2012; Justin Lecher <jlec@gentoo.org> -rapidsvn-0.12.1_pre8247.ebuild,
+  +rapidsvn-0.12.1.ebuild, +files/rapidsvn-0.12.1-locale.patch,
+  +files/rapidsvn-0.12.1-svncpp_link.patch,
+  -files/rapidsvn-0.12.1_pre8247-svncpp_link.patch:
+  Version Bump, #436412; remove prereleases; honor LINGUAS, #406409
 
   07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, #24135.
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch
new file mode 100644
index 000000000000..e1712df85b19
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch
@@ -0,0 +1,23 @@
+--- rapidsvn-0.12.0dfsg.orig/src/locale/Makefile.in
++++ rapidsvn-0.12.0dfsg/src/locale/Makefile.in
+@@ -369,8 +369,7 @@ all: all-mo
+ distclean: clean
+ clean:
+ 	for i in $(RAPIDSVN_LANGUAGES) ; do \
+-		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo ; \
+-		fi ; \
++		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo || true; \
+ 	done
+ .PHONY: all-mo
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- rapidsvn-0.12.0dfsg.orig/src/locale/Makefile.am
++++ rapidsvn-0.12.0dfsg/src/locale/Makefile.am
+@@ -38,7 +38,6 @@ all: all-mo
+ distclean: clean
+ clean:
+ 	for i in $(RAPIDSVN_LANGUAGES) ; do \
+-		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo ; \
+-		fi ; \
++		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo || true; \
+ 	done
+ .PHONY: all-mo
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1_pre8247-svncpp_link.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
index da858583670d..4df855fb79b4 100644
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1_pre8247-svncpp_link.patch
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
@@ -1,7 +1,7 @@
 Index: src/svncpp/Makefile.am
 ===================================================================
---- libsvncpp/Makefile.am
-+++ libsvncpp/Makefile.am
+--- src/svncpp/Makefile.am	(revision 7100)
++++ src/svncpp/Makefile.am	(working copy)
 @@ -27,3 +27,7 @@
  	url.cpp \
  	wc.cpp
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1_pre8247.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1.ebuild
index f2d81faff334..dff9ec5f9bd7 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1_pre8247.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.1_pre8247.ebuild,v 1.5 2012/08/10 07:04:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.1.ebuild,v 1.1 2012/10/07 11:20:26 jlec Exp $
 
 EAPI=4
 
@@ -17,8 +17,9 @@ MY_REL="1"
 
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
 HOMEPAGE="http://rapidsvn.tigris.org/"
-#SRC_URI="http://www.rapidsvn.org/download/release/${MY_PV}/${P}-${MY_REL}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+SRC_URI="
+	http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
+	doc? ( http://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 SLOT="0"
@@ -38,10 +39,12 @@ DEPEND="${COMMON_DEP}
 		app-text/docbook-xsl-stylesheets )"
 RDEPEND="${COMMON_DEP}"
 
-#S="${WORKDIR}/${P}-${MY_REL}"
+PATCHES=(
+	"${FILESDIR}/${P}-svncpp_link.patch"
+	"${FILESDIR}/${P}-locale.patch" )
 
-PATCHES=( "${FILESDIR}/${P}-svncpp_link.patch" )
 AUTOTOOLS_IN_SOURCE_BUILD=1
+
 DOCS=( HACKING.txt TRANSLATIONS )
 
 pkg_setup() {
@@ -50,6 +53,17 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	if use doc; then
+		mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
+	fi
+	strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
+	sed \
+		-e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
+		-i src/locale/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=( --with-wx-config=${WX_CONFIG} )
 
@@ -74,15 +88,21 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile -C doc/manpage manpage
+}
+
 src_install() {
 	autotools-utils_src_install
 
-	doicon rapidsvn/res/rapidsvn.ico librapidsvn/src/res/bitmaps/${PN}*.png
+	doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
 	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
 		"${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
 		"RevisionControl;Development"
 
 	if use doc ; then
+		doman doc/manpage/${PN}.1
 		dohtml "${S}"/doc/svncpp/html/*
 	fi
 }