Fix the installed fontconfig file; 2.6-r1 installed the mikachan file instead of its own.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

5 files changed, 80 insertions, 35 deletions

diff --git a/media-fonts/aquapfont/ChangeLog b/media-fonts/aquapfont/ChangeLog
index e4cf225e38e1..70aaed48963d 100644
--- a/media-fonts/aquapfont/ChangeLog
+++ b/media-fonts/aquapfont/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-fonts/aquapfont
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/aquapfont/ChangeLog,v 1.31 2009/09/12 09:28:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/aquapfont/ChangeLog,v 1.32 2009/09/26 08:31:12 flameeyes Exp $
+
+*aquapfont-2.6-r2 (26 Sep 2009)
+
+  26 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/60-aquapfont-r1.conf, -aquapfont-2.5-r1.ebuild,
+  +aquapfont-2.6-r2.ebuild:
+  Fix the installed fontconfig file; 2.6-r1 installed the mikachan file
+  instead of its own.
 
   12 Sep 2009; Raúl Porcel <armin76@gentoo.org> aquapfont-2.6-r1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #283907
diff --git a/media-fonts/aquapfont/Manifest b/media-fonts/aquapfont/Manifest
index 30e4379da8df..fe4104aa0a71 100644
--- a/media-fonts/aquapfont/Manifest
+++ b/media-fonts/aquapfont/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 60-aquapfont-r1.conf 327 RMD160 7ed28aa14a22bb8eadf04a0f0428a764edf8c2f1 SHA1 dd5a0fb08f23e12c7df5a5b9da0540a49f8f382e SHA256 da0406c00d75c340f103f1f6f3bbac2a2ebddf1aa19e59ea0ff2ec56e21a4e6e
 AUX 60-aquapfont.conf 451 RMD160 3c7982fd41428b427a5b42be9c1cdbc4ae428c48 SHA1 2330edeeb1bf2ceae8161f70be35660bc7a0c369 SHA256 6a7121a499ced003f944767a8938530913c664d1038e422a3d7c62a526b3db09
-DIST aquap2_5.lzh 2991058 RMD160 937fcff01ad925c67fd91b71cf3ff98552bf458f SHA1 1e8b1f71d07a4f6b318c8f5c45d0b43bb81b8294 SHA256 a00561b58c863d00144618ac814e659de42fcb784d62e97726c78af89a785cfc
 DIST aquap2_6.zip 2896324 RMD160 19032ea59789e84c935c448ef5e016ff8a0a4173 SHA1 03f238a68a3a0e605a5e56efb85fa7aa0c276355 SHA256 a30baea0839718313fa1fe4bb136bccb58af269f42a9121fc8a9c14bb3cb5557
-EBUILD aquapfont-2.5-r1.ebuild 742 RMD160 37ac9fd783d5c2307724eb48ffb6f5b3af8f7787 SHA1 a5c9707966a54fdf03d6e9844370da71d0eed704 SHA256 cf53c7e6ac75488a0f87ae3d0f506fce5255a8fdd05c9c52f391762fa344a163
 EBUILD aquapfont-2.6-r1.ebuild 935 RMD160 eb80e90606a2b489e87971a8b24b178aff4ae874 SHA1 264543dbb6dc5ca8a09281c4ffc7bbe7dd443f0d SHA256 b3faaa58f5e43454054ff37c51a2217a2ed58d02a156249bfda36ffc47002fee
+EBUILD aquapfont-2.6-r2.ebuild 1029 RMD160 f33a203eb1fb890a61d113e6f4a14864aff491ff SHA1 347dd4633192c03ad6f98ddd79ee8deb2cb657c3 SHA256 c2117f4bc226aa690303f830dc70f09fffebf69fa88e014fa9aa3b65595ee093
 EBUILD aquapfont-2.6.ebuild 700 RMD160 1ea858fb63f491bf37c9a0fe2254fbb402975d74 SHA1 6950d80782166d297d83e732e6f8505da9a3199b SHA256 5b51f23eb8f040f2da7004b94f682328abed7576a1128417d5a8ef78cf5a6c8e
-MISC ChangeLog 4025 RMD160 45a1574e2b05b17dba8dd513b68ddc767dd77206 SHA1 4c4ee5f0cb9c2a07911260bded7c976a5ca08e09 SHA256 aa168b5382410548849f93227b15982bb1653bf8a48ffb7341a5d0827c390b10
+MISC ChangeLog 4296 RMD160 05225bb7006813004790f98810a5d0991752e2ee SHA1 54ecadc1af0b6022cda366eb2287d1a4f997f72a SHA256 cb92191e94cb69760359409bc3ddb644e7d2f49b8109ee72db962933e16d44f2
 MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq90VQACgkQAiZjviIA2XhCLwCg4+l9FytQjR1dgnFvEwPWIoHK
+Fr4AnAoz50hnyU+lpTEv0zSAkVTJJEm8
+=YBcH
+-----END PGP SIGNATURE-----
diff --git a/media-fonts/aquapfont/aquapfont-2.5-r1.ebuild b/media-fonts/aquapfont/aquapfont-2.5-r1.ebuild
deleted file mode 100644
index 5a85eb4fe171..000000000000
--- a/media-fonts/aquapfont/aquapfont-2.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/aquapfont/aquapfont-2.5-r1.ebuild,v 1.16 2008/01/15 17:18:05 grobian Exp $
-
-inherit font
-
-IUSE=""
-MY_P="${PN/font/}${PV/\./_}"
-
-DESCRIPTION="Very pretty Japanese proportional truetype font"
-HOMEPAGE="http://aquablue.milkcafe.to/"
-SRC_URI="http://aquablue.milkcafe.to/fnt/${MY_P}.lzh"
-
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-LICENSE="aquafont"
-SLOT=0
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-DOCS="readme.txt"
-
-DEPEND="app-arch/lha"
-RDEPEND=""
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack(){
-	lha e "${DISTDIR}/${MY_P}.lzh"
-}
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
new file mode 100644
index 000000000000..00976f36a769
--- /dev/null
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild,v 1.1 2009/09/26 08:31:12 flameeyes Exp $
+
+inherit font
+
+MY_P="${PN/font/}${PV/\./_}"
+
+DESCRIPTION="Very pretty Japanese proportional truetype font"
+HOMEPAGE="http://aquablue.milkcafe.to/"
+SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
+
+LICENSE="aquafont"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+DOCS="readme.txt"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+FONT_CONF=( "${T}/60-aquapfont.conf" )
+
+src_compile() {
+	cp "${FILESDIR}"/60-aquapfont-r1.conf "${T}"/60-aquapfont.conf || die
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+
+	echo
+	elog "To use aquapfont instead of the default font for sans and serif use:"
+	elog "   eselect fontconfig enable 60-aquapfont.conf"
+	echo
+}
diff --git a/media-fonts/aquapfont/files/60-aquapfont-r1.conf b/media-fonts/aquapfont/files/60-aquapfont-r1.conf
new file mode 100644
index 000000000000..3610820e10db
--- /dev/null
+++ b/media-fonts/aquapfont/files/60-aquapfont-r1.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>aqua_pfont</family> <!-- han (ja) -->
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>aqua_pfont</family> <!-- han (ja) -->
+		</prefer>
+	</alias>
+</fontconfig>