Install to libdir instead of libexecdir. Pass --docdir and convert documentation sed to a format it can be pushed to upstream.

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

3 files changed, 25 insertions, 20 deletions

diff --git a/xfce-extra/xfce4-screenshooter/ChangeLog b/xfce-extra/xfce4-screenshooter/ChangeLog
index 6544286f463f..f9b81c330437 100644
--- a/xfce-extra/xfce4-screenshooter/ChangeLog
+++ b/xfce-extra/xfce4-screenshooter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-screenshooter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.91 2012/01/06 11:03:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.92 2012/04/09 18:32:29 ssuominen Exp $
+
+  09 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-screenshooter-1.8.0.ebuild:
+  Install to libdir instead of libexecdir. Pass --docdir and convert
+  documentation sed to a format it can be pushed to upstream.
 
   06 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-screenshooter-1.7.9-r1.ebuild,
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index d4a2e79331ca..e3130b5676b1 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX xfce4-screenshooter-1.8.0-underlinking.patch 378 RMD160 c400261269174f226ad2a4c2ed8d853d42967417 SHA1 c5bd1dcddc2defff49b7835aeb9525a7721ad9d4 SHA256 fc9fa4f810ef73572176d540687bb835911b4dd91d9d15506a25e45668ff2dc9
 DIST xfce4-screenshooter-1.8.0.tar.bz2 1388562 RMD160 5cb38986771ca96e700b41e586b3a117bd46f973 SHA1 cc105a5d3b17248542705cf01368827ef860bec9 SHA256 68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e
-EBUILD xfce4-screenshooter-1.8.0.ebuild 1267 RMD160 e44e7141240cad06fd29612245e986fcd34efa1a SHA1 ae307d136a66a0c1ae02df877ad2ea077d2b234e SHA256 c34fd16920b1ea96af7734e94675da284bf7b43187d6d5700e217c8a26e65936
-MISC ChangeLog 12653 RMD160 e1c6abba29bff270d33ed5f959cb0921e2d8d61a SHA1 d8790056bb851a18dd9c044b427084faf182a372 SHA256 90a93f5b165375523e4bff51d4efd58d72fa694e7203b78191bd224a577d7d87
+EBUILD xfce4-screenshooter-1.8.0.ebuild 1335 RMD160 ec13f65baf8b0128487244219df2fb490d1ec8ba SHA1 d1f4cebaaeb7017c0296fa707833a396165af5a6 SHA256 5018b766ab983f129f6cf07675124087c8e8efc90d66d8473b6bb18346b3a8cd
+MISC ChangeLog 12875 RMD160 e17d32359158094026001bf0e0077c162e1ceb04 SHA1 b3bc140c389eeb962147a5054ea9128cd3909830 SHA256 c7aeb94e815a0d8a261c53e2ed397eecbb4dc50ba3e6879b787a03c2354a13d5
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBtSRAAoJEEdUh39IaPFNcKAH/jZ421UtEzwf1NVVbunOnwkg
-g8iIesTO4TH8BaLhMtxHb+KnuaSsk512rdfMBzgz5RFlHjWgykZ9GafleUqcyYuO
-nXlxWzNmBJZFOlRiQ5rTx4b8hK5lPMudaWFxDX/bjZn41Zt/Vr8JHKWxEUteg2jR
-/70jdr3YSUWwk0uetj3Yr4qjvccKzMN6GBJ/hVgBkXXI+rC+cs5uc5wpcgZjTf5U
-KgNd7gAV97RiA68z3O8bhGDkmrmrtPv5xd0/fDE2E5o3APTKP8xzV2CJ5yjBonxZ
-rhFkqz0076ZFm1Ljo+Lf8Kil8RA22s+AWHtFNYXBSfUEroQPpki1errhD6X23Y0=
-=uoZo
+iQEcBAEBAgAGBQJPgysWAAoJEEdUh39IaPFNFxYH/36shdC8X4zchGL34qACqWQM
+ttiVqJwVVdG7BWOQVdSE3ANYrCmwI0mNawRVrUgCuwigTs/qzL64/yIEMug2mcgk
+f4wrbi1Ww3th2sGgVoEfGzsjV8nY5INdjlNf43OzSCpLXmr0pw7S0YzCsx/gRkpv
+2iwOZL5D3Ia6qAjuPdY/MUAtSyTwz+tczgfxHPH3xePnPAAsfo3f85dtaIRNe5ki
+768CJ/zWOSbiZ/Fxt3X9hbU3qTy7gKYhOwSnZDY8r95YouSY8nml/6/YAdQMywyK
+2ySYnk+ADrCrigcQc/3XAxIsjKD5V+3eNVST4h2go6RfcEqUH4/pIIEAANGi+iI=
+=4tOs
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild
index 9f3850586b64..66d1e5d32a57 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.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/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild,v 1.8 2012/01/06 11:02:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.0.ebuild,v 1.9 2012/04/09 18:32:29 ssuominen Exp $
 
 EAPI=4
 EAUTORECONF=yes
@@ -8,21 +8,21 @@ inherit xfconf
 
 DESCRIPTION="Xfce4 screenshooter application and panel plugin"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
-SRC_URI="mirror://xfce/src/apps/${PN}/1.8/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=net-libs/libsoup-2.26.0
-	>=x11-libs/gdk-pixbuf-2.16:2
+RDEPEND=">=dev-libs/glib-2.16
+	>=net-libs/libsoup-2.26
+	>=x11-libs/gdk-pixbuf-2.16
 	>=x11-libs/gtk+-2.16:2
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXfixes
-	>=xfce-base/exo-0.5
+	>=xfce-base/exo-0.6
 	>=xfce-base/xfce4-panel-4.8
 	>=xfce-base/libxfce4util-4.8
 	>=xfce-base/libxfce4ui-4.8"
@@ -34,6 +34,8 @@ pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
 
 	XFCONF=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(xfconf_use_debug)
 		--enable-xfixes
 		)
@@ -42,8 +44,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i \
-		-e "s:\$(datadir)/xfce4/doc:\$(datadir)/doc/${PF}/html:" \
-		Makefile.am || die
+	sed -i -e 's:$(datadir)/xfce4/doc:$(docdir)/html:' Makefile.am || die
 	xfconf_src_prepare
 }