From 3cf3914e6d1d79715740505d71713933607c5d52 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 12 Sep 2011 10:49:14 +0000 Subject: Unify two last entries, somehow files directory didn't go into first commit as it was supposed to (Portage version: 2.2.0_alpha55/cvs/Linux x86_64) --- x11-terms/roxterm/ChangeLog | 7 ++++--- x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch | 19 ------------------- x11-terms/roxterm/files/roxterm-1.18.5-docdir.patch | 19 ------------------- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch delete mode 100644 x11-terms/roxterm/files/roxterm-1.18.5-docdir.patch (limited to 'x11-terms/roxterm') diff --git a/x11-terms/roxterm/ChangeLog b/x11-terms/roxterm/ChangeLog index 28054d61b72c..a709ca815225 100644 --- a/x11-terms/roxterm/ChangeLog +++ b/x11-terms/roxterm/ChangeLog @@ -1,9 +1,10 @@ # ChangeLog for x11-terms/roxterm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.45 2011/09/12 10:47:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/ChangeLog,v 1.46 2011/09/12 10:49:14 ssuominen Exp $ - 12 Sep 2011; Samuli Suominen -roxterm-1.16.3.ebuild, - -roxterm-1.18.5.ebuild: + 12 Sep 2011; Samuli Suominen + -files/roxterm-1.16.3-docdir.patch, -files/roxterm-1.18.5-docdir.patch, + -roxterm-1.16.3.ebuild, -roxterm-1.18.5.ebuild: [This is a placeholder. Please ignore.] 12 Sep 2011; Samuli Suominen roxterm-1.22.2.ebuild: diff --git a/x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch b/x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch deleted file mode 100644 index c4dea38cc67a..000000000000 --- a/x11-terms/roxterm/files/roxterm-1.16.3-docdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/files/roxterm-1.18.5-docdir.patch b/x11-terms/roxterm/files/roxterm-1.18.5-docdir.patch deleted file mode 100644 index c4dea38cc67a..000000000000 --- a/x11-terms/roxterm/files/roxterm-1.18.5-docdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -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]) -- cgit v1.2.3-65-gdbad