Bump for 7.0RC4.

Package-Manager: portage-2.0.53

5 files changed, 11 insertions, 92 deletions

diff --git a/media-fonts/font-alias/ChangeLog b/media-fonts/font-alias/ChangeLog
index ccfdff7355ea..3bc428a27a4e 100644
--- a/media-fonts/font-alias/ChangeLog
+++ b/media-fonts/font-alias/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/font-alias
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/ChangeLog,v 1.10 2005/12/10 22:05:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/ChangeLog,v 1.11 2005/12/18 19:49:31 spyderous Exp $
+
+*font-alias-1.0.0 (18 Dec 2005)
+
+  18 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/configurable-aliasdir.patch, -font-alias-0.99.0-r2.ebuild,
+  +font-alias-1.0.0.ebuild:
+  Bump for 7.0RC4.
 
 *font-alias-0.99.0-r2 (10 Dec 2005)
 
diff --git a/media-fonts/font-alias/files/configurable-aliasdir.patch b/media-fonts/font-alias/files/configurable-aliasdir.patch
deleted file mode 100644
index 85de68c630fd..000000000000
--- a/media-fonts/font-alias/files/configurable-aliasdir.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-? configurable-aliasdir.patch
-Index: configure.ac
-===================================================================
-RCS file: /cvs/xorg/font/alias/configure.ac,v
-retrieving revision 1.2
-diff -u -b -B -r1.2 configure.ac
---- configure.ac	29 Jul 2005 21:22:47 -0000	1.2
-+++ configure.ac	8 Dec 2005 20:18:22 -0000
-@@ -28,6 +28,13 @@
- 
- AC_PROG_INSTALL
- 
-+DEFAULT_ALIASDIR=${libdir}/X11/fonts
-+AC_ARG_WITH(top-fontdir,
-+	AS_HELP_STRING([--with-top-fontdir=ALIASDIR], [Path to install font encodings]),
-+	[ALIASDIR="$withval"],
-+	[ALIASDIR="$DEFAULT_ALIASDIR"])
-+AC_SUBST(ALIASDIR)
-+
- XORG_RELEASE_VERSION
- 
- AC_OUTPUT([Makefile
-Index: 100dpi/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/alias/100dpi/Makefile.am,v
-retrieving revision 1.1
-diff -u -b -B -r1.1 Makefile.am
---- 100dpi/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
-+++ 100dpi/Makefile.am	8 Dec 2005 20:18:22 -0000
-@@ -19,7 +19,7 @@
- #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
--aliasdir = $(libdir)/X11/fonts/100dpi
-+aliasdir = @ALIASDIR@/100dpi
- alias_DATA = fonts.alias
- 
- EXTRA_DIST = $(alias_DATA)
-Index: 75dpi/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/alias/75dpi/Makefile.am,v
-retrieving revision 1.1
-diff -u -b -B -r1.1 Makefile.am
---- 75dpi/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
-+++ 75dpi/Makefile.am	8 Dec 2005 20:18:22 -0000
-@@ -19,7 +19,7 @@
- #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
--aliasdir = $(libdir)/X11/fonts/75dpi
-+aliasdir = @ALIASDIR@/75dpi
- alias_DATA = fonts.alias
- 
- EXTRA_DIST = $(alias_DATA)
-Index: cyrillic/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/alias/cyrillic/Makefile.am,v
-retrieving revision 1.1
-diff -u -b -B -r1.1 Makefile.am
---- cyrillic/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
-+++ cyrillic/Makefile.am	8 Dec 2005 20:18:22 -0000
-@@ -19,7 +19,7 @@
- #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
--aliasdir = $(libdir)/X11/fonts/cyrillic
-+aliasdir = @ALIASDIR@/cyrillic
- alias_DATA = fonts.alias
- 
- EXTRA_DIST = $(alias_DATA)
-Index: misc/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/font/alias/misc/Makefile.am,v
-retrieving revision 1.1
-diff -u -b -B -r1.1 Makefile.am
---- misc/Makefile.am	12 Jul 2005 04:23:08 -0000	1.1
-+++ misc/Makefile.am	8 Dec 2005 20:18:22 -0000
-@@ -19,7 +19,7 @@
- #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
--aliasdir = $(libdir)/X11/fonts/misc
-+aliasdir = @ALIASDIR@/misc
- alias_DATA = fonts.alias
- 
- EXTRA_DIST = $(alias_DATA)
diff --git a/media-fonts/font-alias/files/digest-font-alias-0.99.0-r2 b/media-fonts/font-alias/files/digest-font-alias-0.99.0-r2
deleted file mode 100644
index 4191151fca6f..000000000000
--- a/media-fonts/font-alias/files/digest-font-alias-0.99.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31344a6fad2a6ec4c8ab995231d5a746 font-alias-0.99.0.tar.bz2 41632
diff --git a/media-fonts/font-alias/files/digest-font-alias-1.0.0 b/media-fonts/font-alias/files/digest-font-alias-1.0.0
new file mode 100644
index 000000000000..75e8a04ea1a4
--- /dev/null
+++ b/media-fonts/font-alias/files/digest-font-alias-1.0.0
@@ -0,0 +1 @@
+MD5 3614b5f504f637f470dbce0476bf8315 font-alias-1.0.0.tar.bz2 42319
diff --git a/media-fonts/font-alias/font-alias-0.99.0-r2.ebuild b/media-fonts/font-alias/font-alias-1.0.0.ebuild
index 0511c8b80b62..65fc37dabf90 100644
--- a/media-fonts/font-alias/font-alias-0.99.0-r2.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/font-alias-0.99.0-r2.ebuild,v 1.1 2005/12/10 22:05:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-alias/font-alias-1.0.0.ebuild,v 1.1 2005/12/18 19:49:31 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
+#SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -14,5 +14,3 @@ DEPEND="${RDEPEND}
 	x11-apps/mkfontscale"
 
 CONFIGURE_OPTIONS="--with-top-fontdir=/usr/share/fonts"
-
-PATCHES="${FILESDIR}/configurable-aliasdir.patch"