Unify two last entries, somehow files directory didn't go into first commit as it was supposed to

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

4 files changed, 8 insertions, 47 deletions

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 <ssuominen@gentoo.org> -roxterm-1.16.3.ebuild,
-  -roxterm-1.18.5.ebuild:
+  12 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -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 <ssuominen@gentoo.org> roxterm-1.22.2.ebuild:
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 16ff7abff737..f46854ca62a5 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX roxterm-1.16.3-docdir.patch 772 RMD160 d52d9232f4b7c4549588d2095d330dd24a575059 SHA1 6d343c52d208f21ac00de75390a09c866fb1d2c1 SHA256 cda6a449b60dbe9bd7d958fbb54d4df44fa6affaf2ba20e8b92522a176f1bedb
-AUX roxterm-1.18.5-docdir.patch 772 RMD160 d52d9232f4b7c4549588d2095d330dd24a575059 SHA1 6d343c52d208f21ac00de75390a09c866fb1d2c1 SHA256 cda6a449b60dbe9bd7d958fbb54d4df44fa6affaf2ba20e8b92522a176f1bedb
 DIST roxterm-1.22.2.tar.gz 960620 RMD160 97587a2f430efb7a944caf4e3b62452c9b914e8b SHA1 aed9c6f0d849b612757b9a300e6198d384e66ccb SHA256 2df06d28a2f4ea29c5744aae258bdfccbb378c0ac6756d057341699ee785023e
 DIST roxterm-2.1.1.tar.gz 946173 RMD160 e601e546a26d7762bf2547a5ba48f8a30f7bb6bb SHA1 c4fb10ca28ca5d781a2ed98cb7e13cbac0762cc9 SHA256 247ed37231acb0b912edacbf2063492fbe8f5fca6ed5b2bc424bf6463c6f317f
 EBUILD roxterm-1.22.2.ebuild 1004 RMD160 ba6782dbfe455c1e3193eccdfa0a91920373e0e9 SHA1 122ad56e57018cc35e75f151b0b10703638edc52 SHA256 f9598ec3f098b432c671e75bd46b2c713b1530edb4165bfc21c521b325f519a7
 EBUILD roxterm-2.1.1.ebuild 1022 RMD160 ec6e7fd178c6233462b4a9ff45f1057b6b7bf329 SHA1 d21d677eb7dc6e310ede36f33c3d82920dc708bd SHA256 62c71abdfa421d48d7d6500ada52a7059961097de23459041a07741110dd0adb
-MISC ChangeLog 6283 RMD160 9c73e745b4111834464292b2f86aa74a67318d4e SHA1 f50696eeecc03d9e7cf5bc5250e3335d21ddaad4 SHA256 328e19bea067077db39e3d3a17c667edd81e38cfe939bb42a4f1a8961dd18bf6
+MISC ChangeLog 6357 RMD160 0a8f65702cdc4792c2a9c94f885d9dfcb49fd5f0 SHA1 c2ccf8ca03362a4725dd5501d27b2430f4502cf7 SHA256 e4098635b5af852fec7ceb5b3c89eb5aea223abc6ece8a3ae83c80baa18629b2
 MISC metadata.xml 207 RMD160 9d07918bde86d48642c53a8e824b0e1d19d0303a SHA1 bfbfe1798d78712b826184a982cfefc17d818d81 SHA256 22c35cff14b8982afbd1fe472a8d5e662b417ffc18e7e4fb52387dd99f877786
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5t44AACgkQXkR9YqOcLPGfjAEAk4NGXw3L5xl2pzBgV2tuxU5t
-ygLJv4rp3CL1jxkaJHMA/RSvH/rfTEQpYgIIDKUWLmWGEgHZpNsmFNCAk+NSOn3c
-=IeOP
+iF4EAREIAAYFAk5t490ACgkQXkR9YqOcLPGeDwEAl2078ZyBhs/TTu4Q44UMS4j7
+O51FoDhgjzrnWCLLi6cBAIFMYXXJnmiCySahNfAAW6l3M3bzu8iuSLXzIV2ZQdZE
+=uXrB
 -----END PGP SIGNATURE-----
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])