diff options
author | Jim Ramsay <lack@gentoo.org> | 2010-01-12 16:13:15 +0000 |
---|---|---|
committer | Jim Ramsay <lack@gentoo.org> | 2010-01-12 16:13:15 +0000 |
commit | be623a35e81ebfab10d1cf7569522441fa2a92bc (patch) | |
tree | 83a89eca7720c3e165148cca7532d33c158dc568 | |
parent | EPYTHON is required for python_mod_optimize(). (diff) | |
download | gentoo-2-be623a35e81ebfab10d1cf7569522441fa2a92bc.tar.gz gentoo-2-be623a35e81ebfab10d1cf7569522441fa2a92bc.tar.bz2 gentoo-2-be623a35e81ebfab10d1cf7569522441fa2a92bc.zip |
Fix documentation location (Bug #297969)
(Portage version: 2.1.7.11/cvs/Linux x86_64)
-rw-r--r-- | x11-terms/roxterm/ChangeLog | 8 | ||||
-rw-r--r-- | x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch | 19 | ||||
-rw-r--r-- | x11-terms/roxterm/roxterm-1.16.3.ebuild | 16 |
3 files changed, 38 insertions, 5 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/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 |