media-libs/fontconfig-ultimate: version bump and ebuild update

5 files changed, 58 insertions, 22 deletions

diff --git a/media-libs/fontconfig-ultimate/ChangeLog b/media-libs/fontconfig-ultimate/ChangeLog
index c2439d3bc..0adeec51c 100644
--- a/media-libs/fontconfig-ultimate/ChangeLog
+++ b/media-libs/fontconfig-ultimate/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-libs/fontconfig-ultimate
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fontconfig-ultimate-2.11.1.13 (18 Jun 2014)
+
+  18 Jun 2014; Witold Pilat (fau) <witold.pilat@gmail.com>
+  -fontconfig-ultimate-2.11.0.14.ebuild, +fontconfig-ultimate-2.11.1.13.ebuild,
+  fontconfig-ultimate-9999.ebuild, metadata.xml:
+  version bump and ebuild update
+
 *fontconfig-ultimate-9999 (13 Dec 2013)
 *fontconfig-ultimate-2.11.0.14 (13 Dec 2013)
 
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index f78ba4d04..fe51e6951 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,5 +1,5 @@
-DIST v2.11.0-14.tar.gz 656724 SHA256 5dcc5b9644d9a0dc63a97ca07964f601fb3f2c5f5316eee477b8c7fa32599cd4 SHA512 ea30861fca02028cb1f47fe86631b05f7f73111c3e4abfc109ffdef03a76599b327331dd408027441764cd3a5eb029206637fb322f39c6d7432d7f3db39f47db WHIRLPOOL 7454f416d0267426d4245205de5bf23446643a66f0924accd635f1c473aa305be1380dd11c03b52c7c3c56fccd77c0628a9fb9b12b2e771f89805914f375227a
-EBUILD fontconfig-ultimate-2.11.0.14.ebuild 3467 SHA256 166f71a4a4f63b82f45d0c2838bf66deecd5478c251853b8a45eca769355638a SHA512 2b8d45df1029ee8be6741661ded43fdeac136b387f93147e94dda31030f6fa1f131b7ed6d70b2b7cc12799232c77717ebadeb27d18ac2923a605b4f31417a8a2 WHIRLPOOL 89736d2b2eb60d743e89cf13dfb2dfa5eb30782d682b20760fbc4e8af5218e75fa9dbc1e42b73d830c104e88210ce18cb15e5934f9a38b5836dc6b82964cc1a6
-EBUILD fontconfig-ultimate-9999.ebuild 3371 SHA256 2403971c19af6365f503c5db06b784c1fc4c65aee96e703da14f47597e482abf SHA512 50e6924e2db6cbb5b73d164da20c8629c7873e25b03ed0fdd0bed2b09d3a479b3717fb9805cad7c68d22708007fe0e77032ea85090bb84b8e956324a0f67fa92 WHIRLPOOL 86e177d25013138d7c45fefdb477dc902d544ad064d211cfbccc3e822a61a331f953d13338d58e321c307186a4babef4df5a5c4f5341edd8f7e8f29977410ff5
-MISC ChangeLog 434 SHA256 a97ef9ab476104e9545a0cae5a8d56f058d30f3f10b9dd6f3d90d6f3c737e2ab SHA512 996933948a4ff549a1f4f932e7cb53803e8b1c5c0df8fce231b2df66d6334c481f2320257d567556b6fe5270e2b8e06deae3e20bfc5e2d940547f489e63c39ab WHIRLPOOL 69caf50df6aec5c93d698eca88a217772e9dff9de5f5ae401b944a8ddb8e95f280b9081d3e286f51aaffe6f04135b4d5685f263c688cc40e3add836469ed468d
-MISC metadata.xml 667 SHA256 8779dabddd4a5374959a662aa40f71ac91f6c9f5b00f5f91f6e22dc3834c5b06 SHA512 125d4f11ae1e329882bbe181971b48ee4903c61508afcd3ef398b102476289f3e308ee243912e832eb66dd5c022357ec0b1bced58ac9819b2f7795d7577f1af1 WHIRLPOOL f7ebb9130cfab7ef38d7186e3507bc5a7616b0ffa8167624057a112109b0477216d908512adb6dd7362effc938f3ebbaf1ee86da68dfeaccbf22ff813ccef26b
+DIST v2.11.1-13.tar.gz 642000 SHA256 a249a41db98457c9cd1912b1a118124d62dfaf0d40fe13017492cf23cd15b4fd SHA512 fdb6d3d1ce01e6bae1fd609b6012b7aeffcdef032e79171504e9cc1daa1df4f66bf1fad3b04a1e83a61c3bb8c5db4bb7027b98b5e8f397a8a55db703b041ed80 WHIRLPOOL 454b08b3fa0d6d4a4afa2a3bbf975fe4585fc0315951630408302d3d118a610c7d8252dc771d9a93205c5de2211c83777d4a22705bd6b19fa5334ab3063372e2
+EBUILD fontconfig-ultimate-2.11.1.13.ebuild 3750 SHA256 c114fdceea64151820f9994b24350c4e7b25262d0b8bb05f21c2716c190509d6 SHA512 cc78707d977cebdeba683db1834c0bd34071b6b6ceb206d2bde1c4b7ca7db572d1060724d494fe797f11253e234eafed934160ee5809ccd76b285a390c8b9e73 WHIRLPOOL 2a082b89c9e02088dad9a0c3fe7645671ce3e95ccf409731400b3bfe42fe1a786974f2a325c65e2d82eaaf5be643e854ed9602142bd2f590fffbf2cc888fbdfd
+EBUILD fontconfig-ultimate-9999.ebuild 3654 SHA256 68de7c353c384179cfa6ee3320b9981eb3db007a64ecab9c2a159141a8571a31 SHA512 665498c808e3af2e6580faaaa6dc239020116071526f58b3c3b2d80443e61afa4661fe3ddfd50fcdec68288300c71c6924d1c8832799377140525298e3fab1ff WHIRLPOOL 255062fe5d935014692f1658d76bed545f137d366fe9edda6aac4e078ea7d5f663c789e896a733695ec895b56d7817863d133d071187538ab5c0be344d600f2b
+MISC ChangeLog 702 SHA256 b7a184734b838dea2783b0fdf9c0a93fc57422aa4786aa0386104a67a651e5fb SHA512 5378eeaa708f1f7f6aaf79bcea7ca6c127f854a489b74c248ad8173191bb72cbe65bf51e4aa12700106ac1d3a89a2a06c81b7379e697f3c44dad5da0c84d38f7 WHIRLPOOL ccfe531fbde7fbe9da4aa89f365b650c209c875678e8b34a8914871c05b0a8fba9d47ecef2e18640fcbba847599e8230e678ea0e16bf5de47cdee1f2a8a24c0c
+MISC metadata.xml 731 SHA256 672937232323297e13d21fa36624cb328f0c3f3d53171ca17faa36df0ebafcfd SHA512 e84a55841035ee6d108ebe1b073ce75a2665b548e3259d58f271db08eeac1fe7ad3b57c3d58e280ed88b9ea66986a0703f970941b695d37e73ee351d4f701c78 WHIRLPOOL 2380bac101e40383cd95314be7a3941c4731388818ce6ffbc62fe678259f5b8e6f258981231f9937cf6efe8bc247b1aecab06c961caddc7c750bd17b8cb0d943
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2.11.0.14.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2.11.1.13.ebuild
index 38f6970f8..03df16b03 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2.11.0.14.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2.11.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,13 +8,13 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_version_separator 3 "-")
 DESCRIPTION="A set of rendering and font replacement rules for fontconfig-infinality"
-HOMEPAGE="http://bohoomil.cu.cc/"
+HOMEPAGE="http://bohoomil.com/"
 SRC_URI="https://github.com/bohoomil/fontconfig-ultimate/archive/v${MY_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fonts-ms +fonts-free fonts-extra"
+IUSE="+fonts-ms +fonts-free fonts-extra fonts-non-latin"
 
 RDEPEND="app-admin/eselect-infinality
 	app-admin/eselect-lcdfilter
@@ -23,6 +23,7 @@ RDEPEND="app-admin/eselect-infinality
 	fonts-ms? (
 		media-fonts/corefonts
 		media-fonts/dejavu
+		media-fonts/droid
 		media-fonts/notofonts
 		fonts-extra? (
 			media-fonts/cantarell
@@ -30,6 +31,7 @@ RDEPEND="app-admin/eselect-infinality
 			media-fonts/droid
 			media-fonts/font-bh-75dpi
 			media-fonts/paratype
+			media-fonts/urw-fonts
 		)
 	)
 	fonts-free? (
@@ -37,6 +39,7 @@ RDEPEND="app-admin/eselect-infinality
 		media-fonts/notofonts
 		media-fonts/liberation-fonts
 		media-fonts/heuristica
+		media-fonts/symbola
 		fonts-extra? (
 			media-fonts/cantarell
 			media-fonts/croscorefonts
@@ -44,8 +47,18 @@ RDEPEND="app-admin/eselect-infinality
 			media-fonts/font-bh-ttf
 			media-fonts/libertine-ttf
 			media-fonts/paratype
+			media-fonts/source-pro
+			media-fonts/ubuntu-font-family
 			media-fonts/urw-fonts
 		)
+	)
+	fonts-non-latin? (
+		media-fonts/font-misc-meltho
+		media-fonts/ja-ipafonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/nanumfont
+		media-fonts/wqy-microhei
 	)"
 
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -88,7 +101,7 @@ src_prepare() {
 src_install() {
 	insinto /etc/fonts/infinality/conf.src.ultimate
 	doins conf.d.infinality/*.conf
-	doins fontconfig_patches/{ms,free,custom}/*.conf
+	doins fontconfig_patches/{ms,free,combi}/*.conf
 
 	# Cut a list of default .conf files out of Makefile.am
 	local default_configs config
@@ -110,17 +123,18 @@ src_install() {
 		dosym ../../conf.src.ultimate/"${config}" \
 			/etc/fonts/infinality/styles.conf.avail/ultimate-free/"${config}"
 	done
-	cd ../../fontconfig_patches/custom || die
+	cd ../../fontconfig_patches/combi || die
 	for config in ${default_configs} *.conf; do
 		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-custom/"${config}"
+			/etc/fonts/infinality/styles.conf.avail/ultimate-combi/"${config}"
 	done
 	cd "${S}"
 
+	insinto /etc/fonts/conf.avail
+	doins fontconfig_patches/ftypes/*.conf
+
 	insinto /usr/share/eselect-lcdfilter/env.d
 	doins "${T}"/ultimate
 
-	dodoc doc/fontconfig-infinality-ultimate/README
-	dohtml doc/fontconfig-infinality-ultimate/README.html
 	readme.gentoo_create_doc
 }
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-9999.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-9999.ebuild
index 2f762b75f..e4d1ae5b1 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-9999.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,12 +9,12 @@ EGIT_REPO_URI="https://github.com/bohoomil/fontconfig-ultimate.git"
 inherit readme.gentoo git-2
 
 DESCRIPTION="A set of rendering and font replacement rules for fontconfig-infinality"
-HOMEPAGE="http://bohoomil.cu.cc/"
+HOMEPAGE="http://bohoomil.com/"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+fonts-ms +fonts-free fonts-extra"
+IUSE="+fonts-ms +fonts-free fonts-extra fonts-non-latin"
 
 RDEPEND="app-admin/eselect-infinality
 	app-admin/eselect-lcdfilter
@@ -23,6 +23,7 @@ RDEPEND="app-admin/eselect-infinality
 	fonts-ms? (
 		media-fonts/corefonts
 		media-fonts/dejavu
+		media-fonts/droid
 		media-fonts/notofonts
 		fonts-extra? (
 			media-fonts/cantarell
@@ -30,6 +31,7 @@ RDEPEND="app-admin/eselect-infinality
 			media-fonts/droid
 			media-fonts/font-bh-75dpi
 			media-fonts/paratype
+			media-fonts/urw-fonts
 		)
 	)
 	fonts-free? (
@@ -37,6 +39,7 @@ RDEPEND="app-admin/eselect-infinality
 		media-fonts/notofonts
 		media-fonts/liberation-fonts
 		media-fonts/heuristica
+		media-fonts/symbola
 		fonts-extra? (
 			media-fonts/cantarell
 			media-fonts/croscorefonts
@@ -44,8 +47,18 @@ RDEPEND="app-admin/eselect-infinality
 			media-fonts/font-bh-ttf
 			media-fonts/libertine-ttf
 			media-fonts/paratype
+			media-fonts/source-pro
+			media-fonts/ubuntu-font-family
 			media-fonts/urw-fonts
 		)
+	)
+	fonts-non-latin? (
+		media-fonts/font-misc-meltho
+		media-fonts/ja-ipafonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/nanumfont
+		media-fonts/wqy-microhei
 	)"
 
 DISABLE_AUTOFORMATTING="1"
@@ -86,7 +99,7 @@ src_prepare() {
 src_install() {
 	insinto /etc/fonts/infinality/conf.src.ultimate
 	doins conf.d.infinality/*.conf
-	doins fontconfig_patches/{ms,free,custom}/*.conf
+	doins fontconfig_patches/{ms,free,combi}/*.conf
 
 	# Cut a list of default .conf files out of Makefile.am
 	local default_configs config
@@ -108,17 +121,18 @@ src_install() {
 		dosym ../../conf.src.ultimate/"${config}" \
 			/etc/fonts/infinality/styles.conf.avail/ultimate-free/"${config}"
 	done
-	cd ../../fontconfig_patches/custom || die
+	cd ../../fontconfig_patches/combi || die
 	for config in ${default_configs} *.conf; do
 		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-custom/"${config}"
+			/etc/fonts/infinality/styles.conf.avail/ultimate-combi/"${config}"
 	done
 	cd "${S}"
 
+	insinto /etc/fonts/conf.avail
+	doins fontconfig_patches/ftypes/*.conf
+
 	insinto /usr/share/eselect-lcdfilter/env.d
 	doins "${T}"/ultimate
 
-	dodoc doc/fontconfig-infinality-ultimate/README
-	dohtml doc/fontconfig-infinality-ultimate/README.html
 	readme.gentoo_create_doc
 }
diff --git a/media-libs/fontconfig-ultimate/metadata.xml b/media-libs/fontconfig-ultimate/metadata.xml
index e9e513608..1c562763c 100644
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ b/media-libs/fontconfig-ultimate/metadata.xml
@@ -11,5 +11,6 @@
     <flag name="fonts-ms">Pull in base fonts for ms profile</flag>
     <flag name="fonts-free">Pull in base fonts for free profile</flag>
     <flag name="fonts-extra">Pull in additional fonts for selected profiles</flag>
+    <flag name="fonts-non-latin">Pull in non-latin fonts</flag>
   </use>
 </pkgmetadata>