Clean up.

Package-Manager: portage-2.1.4

5 files changed, 14 insertions, 93 deletions

diff --git a/media-fonts/encodings/ChangeLog b/media-fonts/encodings/ChangeLog
index 0c0c2dad8b4a..c9d7178dbf42 100644
--- a/media-fonts/encodings/ChangeLog
+++ b/media-fonts/encodings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/encodings
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/ChangeLog,v 1.35 2007/06/21 14:12:57 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/ChangeLog,v 1.36 2008/01/31 03:34:33 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/configurable-encodingsdir.patch, -encodings-1.0.0.ebuild:
+  Clean up.
 
   21 Jun 2007; Jeroen Roovers <jer@gentoo.org> encodings-1.0.2.ebuild:
   Stable for HPPA (bug #182387).
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 2f37a1829d24..60c924e01871 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,38 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX configurable-encodingsdir.patch 1624 RMD160 b7c1731485fc181da5d59d08463dc60c6da5d660 SHA1 e8d30542c48940f8b0c25e53d93d7be321bbfdd1 SHA256 97c67824c6abff9dbb0eac825faf4a7b9e779348e344c3c55bec467c868ab97c
-MD5 0ccf647d8bf04eacac43c631b10b1c23 files/configurable-encodingsdir.patch 1624
-RMD160 b7c1731485fc181da5d59d08463dc60c6da5d660 files/configurable-encodingsdir.patch 1624
-SHA256 97c67824c6abff9dbb0eac825faf4a7b9e779348e344c3c55bec467c868ab97c files/configurable-encodingsdir.patch 1624
-DIST encodings-1.0.0.tar.bz2 601812 RMD160 777c98c982be10f224309abe57fa0576dc90cfaf SHA1 daa208a7386ddda28d49de1dba708da9e2c2da79 SHA256 c643f06a9a6c551e807a29f3bedfe44d9d21ea6edef4bf019b00f98586c7d1e7
 DIST encodings-1.0.2.tar.bz2 571623 RMD160 39e063686a1659f58abd5532f5506891c0f17728 SHA1 63622374470204f6501ffb5f4df84228d859c9cf SHA256 6d19107b66bbc96c085b0c2dd286ece22dcb73ba56a17fc95b0f2cbc5d6f4eac
-EBUILD encodings-1.0.0.ebuild 561 RMD160 46dd8dfb25793e37993376272c8c0e59ff6f9cfc SHA1 6fb6f118f1d4d786e09eeacd06109a460df2f197 SHA256 5ae5dbfe4ead7b28571cd972bf3312eef525a7126117febe69696de18bc2e781
-MD5 57678829188bcae697c5968854086810 encodings-1.0.0.ebuild 561
-RMD160 46dd8dfb25793e37993376272c8c0e59ff6f9cfc encodings-1.0.0.ebuild 561
-SHA256 5ae5dbfe4ead7b28571cd972bf3312eef525a7126117febe69696de18bc2e781 encodings-1.0.0.ebuild 561
 EBUILD encodings-1.0.2.ebuild 554 RMD160 8fdd5d9bd6716ab264aeed4e880bf58a9de17652 SHA1 fed8f00920d97076d2786e820f3292bcce323026 SHA256 ee1617e45ab35f6a12e43d850c74a1ba57a82f12020257e65e355e6846253d62
 MD5 2a01b357e4d83345d72af146c9af7748 encodings-1.0.2.ebuild 554
 RMD160 8fdd5d9bd6716ab264aeed4e880bf58a9de17652 encodings-1.0.2.ebuild 554
 SHA256 ee1617e45ab35f6a12e43d850c74a1ba57a82f12020257e65e355e6846253d62 encodings-1.0.2.ebuild 554
-MISC ChangeLog 4533 RMD160 a9f57b3d3d0b6c547296e8131c91b6c7c2dc8a98 SHA1 7f3930bcb13151289b5c97a381c92474ee58cc75 SHA256 0231549cda548c4220d9bd2e9bed36f7771c05a354c025e9ec5900d0f4fcbf31
-MD5 a1f1c8c5d180043cdb03b3eaf6f1c03c ChangeLog 4533
-RMD160 a9f57b3d3d0b6c547296e8131c91b6c7c2dc8a98 ChangeLog 4533
-SHA256 0231549cda548c4220d9bd2e9bed36f7771c05a354c025e9ec5900d0f4fcbf31 ChangeLog 4533
+MISC ChangeLog 4674 RMD160 a937b69dee4e9365702ef7e4b839159ee1be314c SHA1 ea4d0cc600703aa655ba25aa1a31cc337568d566 SHA256 547695c52c1468f2f76f07ad8781d3f639fb65d137d2141439b284a90626b42e
+MD5 c949cf9d09e0e7fc56bc078df91fc5b7 ChangeLog 4674
+RMD160 a937b69dee4e9365702ef7e4b839159ee1be314c ChangeLog 4674
+SHA256 547695c52c1468f2f76f07ad8781d3f639fb65d137d2141439b284a90626b42e ChangeLog 4674
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 9218338cb090306d63270c33e1362d4a files/digest-encodings-1.0.0 250
-RMD160 7359a0cab8213dfc366dd3fdb1bc410f4059fb85 files/digest-encodings-1.0.0 250
-SHA256 c232146148bb4f06c70b2ff5b4f8c8b481a94b8163be4c7c43a14fbd9756e3d0 files/digest-encodings-1.0.0 250
 MD5 fc55e0b9caba5608e4ed7b32a80285b2 files/digest-encodings-1.0.2 250
 RMD160 d21f43a6b3c18fb6ae329fb96d08aec72d6469fe files/digest-encodings-1.0.2 250
 SHA256 35ac5f36eebc9638a7f244c233dc4daf6750cd9087ecd41ee70b805f8b10ad15 files/digest-encodings-1.0.2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGfucGp/wUKkr7RBoRAq3fAJ4mSJKecfmFyxLmRoMOYCB7iOuIKwCggPzX
-pE4jO9LDim358gG+E+5OAZ8=
-=GGH1
+iD8DBQFHoUHRXVaO67S1rtsRAmWRAKD4oQXM4apibCP+uS/Mcc7XzT9KQwCcDx7l
+4lgDXJIPsIOFiiyGuOPodmA=
+=ExIU
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/encodings/encodings-1.0.0.ebuild b/media-fonts/encodings/encodings-1.0.0.ebuild
deleted file mode 100644
index 58421e24bdd7..000000000000
--- a/media-fonts/encodings/encodings-1.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/encodings/encodings-1.0.0.ebuild,v 1.15 2007/02/04 18:41:09 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org font encodings"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-apps/mkfontscale"
-
-CONFIGURE_OPTIONS="--with-encodingsdir=/usr/share/fonts/encodings"
diff --git a/media-fonts/encodings/files/configurable-encodingsdir.patch b/media-fonts/encodings/files/configurable-encodingsdir.patch
deleted file mode 100644
index 25df71168129..000000000000
--- a/media-fonts/encodings/files/configurable-encodingsdir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-? configurable-encodingsdir.patch
-Index: Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/encodings/Makefile.am,v
-retrieving revision 1.2
-diff -u -b -B -r1.2 Makefile.am
---- Makefile.am	6 Oct 2005 23:16:10 -0000	1.2
-+++ Makefile.am	8 Dec 2005 20:05:50 -0000
-@@ -1,6 +1,6 @@
- SUBDIRS = large
- 
--encodingsdir = $(libdir)/X11/fonts/encodings
-+encodingsdir = @ENCODINGSDIR@
- 
- ENCODING_FILES =		\
- 	adobe-dingbats.enc	\
-Index: configure.ac
-===================================================================
-RCS file: /cvs/xorg/font/encodings/configure.ac,v
-retrieving revision 1.3
-diff -u -b -B -r1.3 configure.ac
---- configure.ac	19 Oct 2005 02:48:07 -0000	1.3
-+++ configure.ac	8 Dec 2005 20:05:50 -0000
-@@ -18,6 +18,13 @@
-    AC_MSG_ERROR([gzip is needed to compress font encodings])
- fi
- 
-+DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
-+AC_ARG_WITH(encodingsdir,
-+	AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
-+	[ENCODINGSDIR="$withval"],
-+	[ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
-+AC_SUBST(ENCODINGSDIR)
-+
- XORG_RELEASE_VERSION
- 
- AC_OUTPUT([Makefile large/Makefile])
-Index: large/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/encodings/large/Makefile.am,v
-retrieving revision 1.2
-diff -u -b -B -r1.2 Makefile.am
---- large/Makefile.am	6 Oct 2005 23:16:10 -0000	1.2
-+++ large/Makefile.am	8 Dec 2005 20:05:50 -0000
-@@ -1,4 +1,4 @@
--encodingsdir = $(libdir)/X11/fonts/encodings/large
-+encodingsdir = @ENCODINGSDIR@/large
- 
- ENCODING_FILES =		\
- 	big5.eten-0.enc		\
diff --git a/media-fonts/encodings/files/digest-encodings-1.0.0 b/media-fonts/encodings/files/digest-encodings-1.0.0
deleted file mode 100644
index 03836eb583c8..000000000000
--- a/media-fonts/encodings/files/digest-encodings-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6d3fe9d5359349ceeab657f236c04d5 encodings-1.0.0.tar.bz2 601812
-RMD160 777c98c982be10f224309abe57fa0576dc90cfaf encodings-1.0.0.tar.bz2 601812
-SHA256 c643f06a9a6c551e807a29f3bedfe44d9d21ea6edef4bf019b00f98586c7d1e7 encodings-1.0.0.tar.bz2 601812