Fix documentation location (Bug #297969)

Package-Manager: portage-2.1.7.11/cvs/Linux x86_64

4 files changed, 41 insertions, 7 deletions

diff --git a/x11-terms/roxterm/ChangeLog b/x11-terms/roxterm/ChangeLog
index 4e98ab9e385b..59a859e324e1 100644
--- a/x11-terms/roxterm/ChangeLog
+++ b/x11-terms/roxterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/roxterm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.34 2009/12/10 15:57:16 lack Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.35 2010/01/12 16:13:14 lack Exp $
+
+  12 Jan 2010; Jim Ramsay <lack@gentoo.org> roxterm-1.16.3.ebuild,
+  +files/roxterm-1.16.3-docdir.patch:
+  Fix documentation location (Bug #297969)
 
 *roxterm-1.16.3 (10 Dec 2009)
 
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 49ad2f724d8f..77cff19d39c0 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,3 +1,4 @@
+AUX roxterm-1.16.3-docdir.patch 772 RMD160 d52d9232f4b7c4549588d2095d330dd24a575059 SHA1 6d343c52d208f21ac00de75390a09c866fb1d2c1 SHA256 cda6a449b60dbe9bd7d958fbb54d4df44fa6affaf2ba20e8b92522a176f1bedb
 DIST roxterm-1.10.1.tar.gz 488665 RMD160 bdb02ac2edbcbea1c2d4fbaa23c1b34e3bf674cf SHA1 cff14183d6f5fb7cd97f6fcfc167888f07d0e7f6 SHA256 a5554c85aeea1a507ea7b33896c5231662b5e9e27a2b574171f5105fc128a60e
 DIST roxterm-1.11.1.tar.gz 492276 RMD160 58f2e7df21242cc8f2e89eba39fefc12ea8f31f2 SHA1 47b8a9e342cdf0599577c8680948fb29565e26ec SHA256 f239c18c14838b8cbbe2156a54136cc0e64ac5a0f75e6f79647fac8dccb8d17d
 DIST roxterm-1.13.5.tar.gz 786093 RMD160 6cde951f4bbf5abd72857a86afb1a56322b5b6cb SHA1 2ab16e40bfda357d11d369b4a583b8e2c7036e6f SHA256 40174e103ba635f41539ffa835fbdaf8f1bc10b241eed0b1f5ef8695035f2c82
@@ -6,7 +7,7 @@ DIST roxterm-1.9.1.tar.gz 484548 RMD160 3e8425c478ff6ce48e0ed8c39e46565e9fdcba71
 EBUILD roxterm-1.10.1.ebuild 764 RMD160 b76a7af2d3d4909b9247d64b065f47446f63b5ff SHA1 1e967997932e147e3f49cea302181277d65c650c SHA256 bc40fce6fc9383a5aca0d3c9f75d0ea2f36a9dfbe222e51e1f78dbda4a39d73e
 EBUILD roxterm-1.11.1.ebuild 759 RMD160 7b2a2c60a62afcac9abf6df9871a05492a95f431 SHA1 685f36bd3e39097b89858aa1088210fa9e964c8d SHA256 325b32fb0dbb7bfb2f3428b70441bb84a4dc0be5ba760d2148bdfa5155fd2f10
 EBUILD roxterm-1.13.5.ebuild 760 RMD160 85fcb66767b00352fb81b08f7ad3240f0e205832 SHA1 0c3fd2b0ef9c22b1a991e3e7d5e9d0d989830830 SHA256 cbdc5c20f78f743f6f3aa3edcacb511b798d43e309d5e381161ffbe0f43e2871
-EBUILD roxterm-1.16.3.ebuild 760 RMD160 4e551164146a73e4985c2044be2571a2a1787b5b SHA1 0175f70be2deaad9ada7473a0e4a3b37b9ca52db SHA256 d100bd56588a82f7c9fb0f9b0a8e219fa2baf493a22f9ff4918e0d97a4e31722
+EBUILD roxterm-1.16.3.ebuild 909 RMD160 732c56abbd0efc37c4614dfd49547593abb2705b SHA1 7c617a0dcf5ecf77ef0b9832c64edaf7d34677b8 SHA256 7d96a201b08a9799ad7491b0c3a705628f6c71d83b6c9dca7a84959b2ce68690
 EBUILD roxterm-1.9.1.ebuild 760 RMD160 046e0e2337fbdb026a9b2736a831e69b5392b29d SHA1 c59282cfbc99604eae4db8a0b5061f704110be52 SHA256 e7b57e26605dc509f7bc8588d29d8cd6d00bc369b245d4dc9268b3420519edd0
-MISC ChangeLog 4719 RMD160 3d815dee8a387fee68c2613591d364cbbf426675 SHA1 7ffdffaa94509d7b4977bb4a2f86b30572b8bd6d SHA256 41179e614584eff7cd19bebc7de46dabdc47becc63ad93fe6837eca661060778
+MISC ChangeLog 4868 RMD160 e79264d2eb06355198ca70df6a7ddbe52fa265bb SHA1 02d65c65be2a82250a23d3fb940b4b73bdd47571 SHA256 561513356dd10ddd29e3c09055e0d44a34d6fb1dd2275696bf47bcb207201762
 MISC metadata.xml 207 RMD160 9d07918bde86d48642c53a8e824b0e1d19d0303a SHA1 bfbfe1798d78712b826184a982cfefc17d818d81 SHA256 22c35cff14b8982afbd1fe472a8d5e662b417ffc18e7e4fb52387dd99f877786
diff --git a/x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch b/x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch
new file mode 100644
index 000000000000..c4dea38cc67a
--- /dev/null
+++ b/x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch
@@ -0,0 +1,19 @@
+diff --git a/configure.ac b/configure.ac
+index 647325d..1551c13 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -175,9 +175,12 @@ AC_DEFINE_UNQUOTED(DATA_DIR, "$dir", [datadir])
+ m4_pattern_allow(PKG_DATA_DIR)
+ AC_DEFINE_UNQUOTED([PKG_DATA_DIR], "$dir/$PACKAGE", [pkgdatadir])
+ m4_pattern_allow(PKG_DOC_DIR)
+-AC_DEFINE_UNQUOTED([PKG_DOC_DIR], "$dir/doc/$PACKAGE",
++
++expanded_docdir=`eval echo ${docdir}`
++TH_EXPAND_VARS(expanded_docdir)
++AC_DEFINE_UNQUOTED([PKG_DOC_DIR], "$expanded_docdir",
+            [Where package's documentation is installed])
+-AC_SUBST(pkgdocdir, ["$dir/doc/$PACKAGE"])
++AC_SUBST(pkgdocdir, ["$expanded_docdir"])
+ m4_pattern_allow(ICON_DIR)
+ pkgicondir="$dir/icons/hicolor/scalable/apps"
+ AC_DEFINE_UNQUOTED([ICON_DIR], "$pkgicondir", [Icon dir])
diff --git a/x11-terms/roxterm/roxterm-1.16.3.ebuild b/x11-terms/roxterm/roxterm-1.16.3.ebuild
index fbbc61beafce..a8c4043c75b7 100644
--- a/x11-terms/roxterm/roxterm-1.16.3.ebuild
+++ b/x11-terms/roxterm/roxterm-1.16.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-1.16.3.ebuild,v 1.1 2009/12/10 15:57:16 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-1.16.3.ebuild,v 1.2 2010/01/12 16:13:14 lack Exp $
 
-inherit eutils
+EAPI=2
+inherit eutils autotools
 
 DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
 HOMEPAGE="http://roxterm.sourceforge.net/"
@@ -21,6 +22,15 @@ RDEPEND=">=dev-libs/glib-2.6
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.20"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-docdir.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir="/usr/share/doc/${PF}"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog