version bump, bug #552402

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

3 files changed, 138 insertions, 19 deletions

diff --git a/media-libs/fontconfig-ultimate/ChangeLog b/media-libs/fontconfig-ultimate/ChangeLog
index 07847d3bf0dc..7440e0ff37a9 100644
--- a/media-libs/fontconfig-ultimate/ChangeLog
+++ b/media-libs/fontconfig-ultimate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/fontconfig-ultimate
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-ultimate/ChangeLog,v 1.1 2015/05/09 09:59:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-ultimate/ChangeLog,v 1.2 2015/08/05 07:06:58 yngwin Exp $
+
+*fontconfig-ultimate-2015.08.01 (05 Aug 2015)
+
+  05 Aug 2015; Ben de Groot <yngwin@gentoo.org>
+  +fontconfig-ultimate-2015.08.01.ebuild:
+  version bump, bug #552402
 
 *fontconfig-ultimate-2015.04 (09 May 2015)
 
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index c03a008d3e0e..eac9909da790 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST fontconfig-ultimate-2015.04.tar.gz 455899 SHA256 e3bc9dd9c145156bd7bfa8e70c2328f47be6873da31c319bc594a5819afb8732 SHA512 cdf11c298c9746c720dd6a4e1d361aa16244fdd46630fa00fea03d6d57956b6cee41b3ea439c84d81756a11d63768e4672851c9692a87944b6688a9763a06096 WHIRLPOOL 6847f41cb76d9da8b3b00143a7277b7be516390780ae92ef942aaa11d5ce785c555f8fe79d58200e684dbeb1b17735c215ba886db429c56750251c58abce294a
+DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 SHA256 19b3eac37f589a651e90507680c80e19bcb2ed4e3e6c63da7ca3c6e22bb209e9 SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9 WHIRLPOOL f26910fc2bebf15cb86376ee7b690a46c2d2f6f915f410307e9e9c20155a2bdbf5b8e2d63cafb371e44e63058f41ed93b5c8b09b36feb740970cb468644e18eb
 EBUILD fontconfig-ultimate-2015.04.ebuild 3267 SHA256 c226aea2e860568e1c9e67656590de38578c3e85b96eb874d0149823535b866e SHA512 a727d384ecc71756e07407eec620eefa81b1451513cfe776eea897596c12131e9ccd7346f16f28590cd06349070c3b04a6f1aaa7838023a01bd909c6803b56f0 WHIRLPOOL 51428c569f33b176afa7c3575e9ed2b32ad446f24a1b016126e4294012aa4b8707059f480460cc7af26229f8c6b31c18bbfeb7c873c8848e27d3405c7d0cb3b7
-MISC ChangeLog 475 SHA256 d90c02d1cea34b4994486166b1f9566c139a81706c36ecf9b721532569879f95 SHA512 80b96db7d9290a0d6d18e4b4891f10c1540f8aac1dd594a9f1d5c6404ab0e73ea447c5501080f9de5989bc3ee07e96d03f1560476805793ab1439d9ef50a7764 WHIRLPOOL 9514492d9938b0acb87edbbe672e3450dd16a9b4296d670e4969a73586a01d0b606d977a7326fc7c11fd642e522fce2742db08f01a323015488deb0d44628b0b
+EBUILD fontconfig-ultimate-2015.08.01.ebuild 3270 SHA256 cf852d88cc0fadd80ad26bf2ac9d75fc99a500406700cd3f262bdb8a7758a3bd SHA512 a1e91cdd47c65fbab3fc65ecfd0e5f9e7941f225f923c4095700054e21a7fc3336d96fe438e3825260a70df0b348cb86d8c1f4762ab6809f6d4c109cf462a808 WHIRLPOOL c154e871fcd92f0129c92851505ad865f480c494e0b949befab493d4f71e1ade404cd47bd2ed4f2352c6456f5e51fcb8cb174f8b106080a9fedd7b93021ce7d4
+MISC ChangeLog 641 SHA256 4836c5ffe23f1cf78c6ce47cc5af3f58fd2d1171cff83682e7c741108bbb222c SHA512 52254990b3a565aac01352fdae71b29549619dbedc9d088523f40e54d3908b541975530c6a047a99d1e8298298e150036d9a49d6f6bcbf4c31ef2e891564863f WHIRLPOOL 558d4b0ae9e2911f296fd02c12c7d57a2d5a7860706d45f2d05c1c417a24b53a991fce2b298c33515b41a08c500eedef73fb484cdd41ceef0c25fe3500c8800e
 MISC metadata.xml 396 SHA256 9240aeaabcad00cb791d42e9730adf1f64228f508479c7a0de47de0ec64d2752 SHA512 575ca2695e42513466e42d656dd0f0c2306c1137587450c0ef95c9967aca0a332ac2ceec41b860bf6b0d2d1396cdab417474ccebc6b7c9ec2ca4c80f229d1eec WHIRLPOOL 916336fd3ad6c077b957487785f7dbdcfb8a6a7525f8add9cc2c273114ef9c986abb02832ecb21835df478d578556956f679969c127985bf342368da0a649035
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfuV9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3g8P/RUPJwdyZSXMH4GbBfcVSoQr
-WuoBcppMtN9EVkxQXwmM50EcbQazIoPTVlkIhfh8cVjz1cOXNcbBzudWTyFiL/wL
-Qa0fG2TI6XVbla+ceKtBE6R8ao/hmNLZi+RcrLDSoGHkmutWNgGw2Zhlkb3o8q8O
-7UcguT4qXRmPG+krkVFteHCkJ4EPQN1oEtDNpBmG2KPnQFi481XANUXAVW9tHkga
-hCvLj5u3O5h2iRmnGVKx4h5gLrcm8vX7pUPVux/6ZkoK480bLX89sYdjOXJgHpXH
-t22i3DNyENeqd4M6C8WZZ8GTIzuQ4ys1WrY8PNIejOaru/d+zeqbDBb7C5LQUsUj
-X7yLp4W93DrNO3gkFU5sM4hCPG+SJ7gkRsfBqh9f08J2yQu+7lpnYpfnCnOWOi6s
-JZl4H7SJ/IIUmITOuP6/tCOGvnHe+XVrCHnnyjBaF586bEWnYXUUndWmJUULDGNh
-rdOq2kB8HvhG9UqZvC+F/W5ULXJccghlidMdADnn1yL+8xzdrk3UPda8VIxYWqq5
-VSklcM9t8BCEb76fcsb+cJj5iEtMSmAi/iZPSwOouZRnppoTxdLNpW0jqtorEPKH
-3GGE9Me+X6wHxYa6YQmeM1q0VJy9jbZIkp4+HMBbTeIYT+q8dciWGuara9ueWjHn
-dpGVufxFIBIciinu4PC7
-=7Mp0
+iQJ8BAEBCABmBQJVwbYZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO4bUP/A7qAcaWzGu2SyhevCcK6ZfO
+Ei9yS6SyGS6X6uRJ0lFQJ/z5Sj+zQjZFkNm0rym2R5UIAnioTP/9nIcnICns4FA2
+t8W4MylgRyW5u+UG5Wlj1GeoEKI7FSJcXqa0IDRVB35jv+9QdZ+5U6QuhPlgik+q
+jkbAPPX6dznjEso3ekkyOTKeAiqOeeWA/zTEk1kZXatf+RgYTrOp6Xpuo+H5KsqR
+qrQh6/37VkFDjQsObEUSKkcPE9PbqKlQ3iR4UsNgwo71051zeL1sMNW6dRJas+10
+T2i2c2ZenZ58+oaHiW/gHCB2M1BXZEZCCJu4NUGBmqH9QqmWN6sHxpMBi34Q8MMw
+TxeY0vMbd10tawEw2GV9++XwM6ZZCXeWjq5kVIDA50U4PbVfYZ31JzDnhvA6ch7t
+/tyNdpVXqx0BW5B4Nzw86dZhpJMl1WvG1z8u1NsDHpSGJ4qxOEKfSfzjL0XM0Rv8
+zn8tt/YHDheyB3DvRa9XpgGma9QTWGdXjF94i57p0Eam/QZsOtO/eqjOjgwBWYgA
+Ywg7W1ivsZJI3l+/lJpzDx+flsdusXb0bUU2DxY1090HlNwFfO2oyITvJG+3xe0V
+tpRMOtY17wODlPwimW+d4xlCsj9zEJMueX5UGtJY57iWhugaMPw+2h3f3AqqQtkG
+NEBbVfiXIWG7/Z5D8n4/
+=BUEo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
new file mode 100644
index 000000000000..185ca7b57f1f
--- /dev/null
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild,v 1.1 2015/08/05 07:06:58 yngwin Exp $
+
+EAPI=5
+inherit readme.gentoo versionator
+
+MY_PV=$(replace_all_version_separators "-")
+DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
+HOMEPAGE="http://bohoomil.com/"
+SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-infinality
+	app-eselect/eselect-lcdfilter
+	media-libs/fontconfig-infinality
+	media-libs/freetype:2[infinality]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DISABLE_AUTOFORMATTING="1"
+DOC_CONTENTS="1. Disable all rules but 52-infinality.conf using eselect fontconfig
+2. Enable one of the \"ultimate\" presets using eselect infinality
+3. Select ultimate lcdfilter settings using eselect lcdfilter"
+
+BLACKLIST="43-wqy-zenhei-sharp.conf"
+
+src_prepare() {
+	pushd fontconfig_patches/fonts-settings || die
+	rm ${BLACKLIST} || die
+	popd
+
+	# Generate lcdfilter config
+	echo -e "################# FONTCONFIG ULTIMATE STYLE #################\n" \
+	> "${T}"/ultimate || die
+
+	local infinality_style
+	infinality_style=$(sed --quiet \
+		-e 's/^USE_STYLE="*\([1-9]\)"*/\1/p' \
+		freetype/infinality-settings.sh) || die
+
+	if ! [ -n "$infinality_style" ]; then
+		ewarn "Missing USE_STYLE variable in package source."
+		infinality_style=1
+	fi
+
+	sed --quiet \
+		-e '/INFINALITY_FT_FILTER_PARAMS=/p' \
+		freetype/infinality-settings.sh \
+	| sed --quiet \
+		-e "${infinality_style} s/[ \t]*export[ \t]*//p" \
+	>> "${T}"/ultimate
+	assert
+
+	sed --quiet \
+		-e '/INFINALITY_FT_FILTER_PARAMS/ d' \
+		-e 's/^[ \t]*export[ \t]*INFINALITY_FT/INFINALITY_FT/p' \
+		freetype/infinality-settings.sh \
+	>> "${T}"/ultimate || die
+}
+
+src_install() {
+	insinto /etc/fonts/infinality/conf.src.ultimate
+	doins conf.d.infinality/*.conf
+	doins fontconfig_patches/{ms,free,combi}/*.conf
+
+	# Cut a list of default .conf files out of Makefile.am
+	local default_configs config fonts_settings
+	default_configs=$(sed --quiet \
+		-e ':again' \
+		-e '/\\$/ N' \
+		-e 's/\\\n/ /' \
+		-e 't again' \
+		-e 's/^CONF_LINKS =//p' \
+		conf.d.infinality/Makefile.am) || die
+
+	# Install per-font settings
+	pushd fontconfig_patches/fonts-settings || die
+	doins *.conf
+	fonts_settings=$(echo *.conf)
+	popd
+
+	# Install font presets
+	pushd fontconfig_patches/ms || die
+	for config in ${default_configs} ${fonts_settings} *.conf; do
+		dosym ../../conf.src.ultimate/"${config}" \
+			/etc/fonts/infinality/styles.conf.avail/ultimate-ms/"${config}"
+	done
+	popd
+	pushd fontconfig_patches/free || die
+	for config in ${default_configs} ${fonts_settings} *.conf; do
+		dosym ../../conf.src.ultimate/"${config}" \
+			/etc/fonts/infinality/styles.conf.avail/ultimate-free/"${config}"
+	done
+	popd
+	pushd fontconfig_patches/combi || die
+	for config in ${default_configs} ${fonts_settings} *.conf; do
+		dosym ../../conf.src.ultimate/"${config}" \
+			/etc/fonts/infinality/styles.conf.avail/ultimate-combi/"${config}"
+	done
+	popd
+
+	insinto /usr/share/eselect-lcdfilter/env.d
+	doins "${T}"/ultimate
+
+	readme.gentoo_create_doc
+}