Fix HTML documentation install path. EAPI4.

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

4 files changed, 30 insertions, 23 deletions

diff --git a/xfce-extra/xfce4-clipman-plugin/ChangeLog b/xfce-extra/xfce4-clipman-plugin/ChangeLog
index 99b63e544083..901ff7a32dc2 100644
--- a/xfce-extra/xfce4-clipman-plugin/ChangeLog
+++ b/xfce-extra/xfce4-clipman-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-clipman-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/ChangeLog,v 1.28 2011/03/28 14:39:20 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/ChangeLog,v 1.29 2011/05/19 21:26:46 ssuominen Exp $
+
+  19 May 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-clipman-plugin-1.1.3.ebuild:
+  Fix HTML documentation install path.
 
   28 Mar 2011; Christoph Mende <angelos@gentoo.org>
   xfce4-clipman-plugin-1.1.3.ebuild:
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index d6bd187332a9..6314606afad2 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-clipman-plugin-1.1.1-exo.patch 700 RMD160 b0a9a0f21cce32dcec98464dc7ec0ae97cfd0630 SHA1 47736459f37ed2ab7189575c08865c488c153c91 SHA256 3566c0224b7de8c9e7c48af02ce042c2b3529ce094a40d31297933084fbf240a
+AUX xfce4-clipman-plugin-1.1.1-exo.patch 475 RMD160 8007fc18d876d1d210f339a74b2523892874a83d SHA1 35aa61a8edfd8ffbb22e1cab48ba9c80673bea05 SHA256 1bc2ea5614f3d4b3dae0653ff92b8f35ed2489af3eb678cc4fc973fc49897518
 DIST xfce4-clipman-plugin-1.1.3.tar.bz2 801564 RMD160 5e7134b53b94dace4baa62761771823118d05b99 SHA1 261f82dcc8313cef9e7a52494e58741c2b2ada64 SHA256 4a306bba5b68b88c93f36ad5aa1cc472fdb2115144f600067146853cfdf9c08c
-EBUILD xfce4-clipman-plugin-1.1.3.ebuild 1153 RMD160 441fbdab8c60f9f2df4cb66793321cd5a5fd9017 SHA1 7093f5a3a4875481d916898f3fde94440226d595 SHA256 d66df9ed77374763ccbfc8446b618c19c2656f3275a6b32406b8f547b595062b
-MISC ChangeLog 4180 RMD160 7485823c5fd23205e395ec9de1dfae4755170431 SHA1 07af519ba3a696b715678935962a3c101ebcd57b SHA256 b8c75d3ad5a424309d87c36788423a8cc469e696112526bf3cf68c5c58c76767
+EBUILD xfce4-clipman-plugin-1.1.3.ebuild 1308 RMD160 d579e1bb81bd79fef10f251512e9f41675885f99 SHA1 19508ce59bac8db60a19e3607792af04def392b1 SHA256 11c8130363df44675322d0688bfccd9cceed21fde8b204596af11e62d7cdf523
+MISC ChangeLog 4313 RMD160 af64480077125801cf2c6a81adba37bf09b2bf86 SHA1 1ec7201e4cdbb972eee285941cc677b835531e83 SHA256 d14cf8844687708395e4d874c48d0ab4df95478c329852bc3595a32d0439494f
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2Qj2kACgkQmWq1bYTyC0PYYgEAkSl5KC+cEFGUljMEDoAhUlDj
-kOu10yZGqKNjoAWaH5kBAJVo4M0d4Ynyn058YHtalDMXppSr83/xnn4XaVm9pne+
-=DdAI
+iF4EAREIAAYFAk3Vis0ACgkQXkR9YqOcLPGNZgD+IO1wm4GyyPnb+UeV8ZfJAE2v
+DL9Gk8egGjBvY5J8XWMA/R45+TNtMnsWDPZuyRrwq4sN3ONnmPodB9tCH5Zpjvcz
+=cgxI
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-clipman-plugin/files/xfce4-clipman-plugin-1.1.1-exo.patch b/xfce-extra/xfce4-clipman-plugin/files/xfce4-clipman-plugin-1.1.1-exo.patch
index 68ef900f8d49..1a2a012cf99b 100644
--- a/xfce-extra/xfce4-clipman-plugin/files/xfce4-clipman-plugin-1.1.1-exo.patch
+++ b/xfce-extra/xfce4-clipman-plugin/files/xfce4-clipman-plugin-1.1.1-exo.patch
@@ -1,6 +1,5 @@
-diff -ur xfce4-clipman-plugin-1.1.1.orig/configure.ac xfce4-clipman-plugin-1.1.1/configure.ac
---- xfce4-clipman-plugin-1.1.1.orig/configure.ac	2009-09-30 19:04:22.000000000 +0300
-+++ xfce4-clipman-plugin-1.1.1/configure.ac	2009-10-24 20:28:34.000000000 +0300
+--- configure.ac
++++ configure.ac
 @@ -63,7 +63,8 @@
  dnl *** Check for required packages ***
  dnl ***********************************
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild
index 0f9982d0e369..198b38d9b374 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild,v 1.10 2011/03/28 14:39:20 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild,v 1.11 2011/05/19 21:26:46 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 EAUTORECONF=yes
 inherit xfconf
 
-DESCRIPTION="a simple cliboard history manager for Xfce4 Panel"
+DESCRIPTION="A clipboard manager plug-in for the Xfce panel"
 HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.1/${P}.tar.bz2"
 
@@ -19,11 +19,11 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	dev-libs/libunique:1
 	>=gnome-base/libglade-2.6:2.0
 	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.4
-	>=xfce-base/libxfcegui4-4.4
-	>=xfce-base/xfce4-panel-4.4
-	>=xfce-base/xfconf-4.6
-	>=xfce-base/exo-0.3"
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
+	>=xfce-base/xfconf-4.8
+	>=xfce-base/exo-0.6"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
@@ -31,11 +31,15 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${PN}-1.1.1-exo.patch )
+	XFCONF=( $(use_enable debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
 
-	XFCONF=(
-		--disable-dependency-tracking
-		$(use_enable debug)
-		)
+src_prepare() {
+	sed -i \
+		-e "/imagesdir/s:xfce4/doc:doc/${PF}/html:" \
+		-e "/TARGET_DIR/s:xfce4/doc:doc/${PF}/html:" \
+		docs/manual/*/{,images/}Makefile.am || die
 
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	xfconf_src_prepare
 }