xkeyboard-config ebuild with Svorak A5

author: Peter Asplund <peter.azp@gmail.com> 2013-10-26 18:55:31 +0200
committer: Peter Asplund <peter.azp@gmail.com> 2013-10-26 18:55:31 +0200
commit: 2366049d5f13c14afe419bbe36a4c9310749c0c7 (patch)
tree: ad86deb0d68da42c9122e51a57d51d7e0925efd4
parent: Rename ebuild to -r1 and recreate Manifest. (diff)
download: AzP-2366049d5f13c14afe419bbe36a4c9310749c0c7.tar.gz
AzP-2366049d5f13c14afe419bbe36a4c9310749c0c7.tar.bz2
AzP-2366049d5f13c14afe419bbe36a4c9310749c0c7.zip
15 files changed, 969 insertions, 906 deletions
diff --git a/media-gfx/alchemy/Manifest b/media-gfx/alchemy/Manifest
index d287e01..f1852ee 100644
--- a/media-gfx/alchemy/Manifest
+++ b/media-gfx/alchemy/Manifest
@@ -1,7 +1,6 @@
-AUX alchemy-0.7-build.xml-install.patch 10245 RMD160 6283f22c7974e3065545537cc340625e6a4a002a SHA1 746f8f743d00eb042680ba34eea3ab67400a64be SHA256 3ea8abe9d9cb812124e9bc22b5161c61b61c166954342ba54b56a57ef0e16277
-AUX alchemy-9999-build.xml-install.patch 11930 RMD160 cdbf8c6749ee080f9d5ee50f73daf5018afbd4d1 SHA1 25e25d6ded6799ec0c7febf3e75c2ec049996ccc SHA256 3fb687a77f01d5534ee834bcca4457a3d876ba13e8e038ec3418a6ea35cf6a24
-AUX alchemy.desktop 141 RMD160 a1e96da4027cd3954793b969133f52ca0e7acbf0 SHA1 65327f0652a4485bf2f3c12d1d5837c07e8b8746 SHA256 4970db3d47daae3df17ebbabd9443f9b5bd325b6bc8d210d3b1f023538c55753
-AUX build.xml 7956 RMD160 eb0a9408ee8d314b5cf6d2c6855af9e8b5b2fa4a SHA1 6d5ab927e16fb84e58dc2284681c52133dc45696 SHA256 bf9a7bcdf797586180bcae951c2cfa67972fc0482a038167f00a08ae15ecb09b
-EBUILD alchemy-0.7.ebuild 1295 RMD160 254a19783202bb25b0ea9f5f04a7a631739ef044 SHA1 cce4c13380dfa7784dbaba846f280c3b550b12da SHA256 d4cf78c655bdce2ac9ed342e6c4524c04d5a285fad179b965a13318e4cc39497
-EBUILD alchemy-9999.ebuild 1235 RMD160 76fce8a056aa6333f0972237f96cecfd7de3069f SHA1 314cd35cae465b970f3287722263f3f64ec1dd1b SHA256 aae7d92c7d22462c886774d011a50df24d4448eef096f7b0774b8d66bfe29a9b
-MISC build_old.xml 15563 RMD160 159c81073cd07e6a0209e169e3ba73ebde28f56d SHA1 ec7cad00258e118f0c58641700c8948869dd8b7f SHA256 3d9bd2aaf9910e96015982f234b8035d537b998aba8fd644b19c6c4c42f5690f
+AUX alchemy-0.8-build.xml-install.patch 10245 SHA256 3ea8abe9d9cb812124e9bc22b5161c61b61c166954342ba54b56a57ef0e16277 SHA512 57c2de7a3867a7c6abb8d26d1c27c2afaae5fa759246700f8676755965bf6bb61f990f1155b8d65f5151bdc14781f0fd0d9a46ecbdbc0862a9f2c23c835f84e5 WHIRLPOOL bacd5a2df5cc2644c5f726035c88fb9683d74fa8c50365722ffb118dc2cc5eb3646f5f7e79c1306974a6e48bb90f2656d4f2f0cbfc09264f590bbd48d6179e6f
+AUX alchemy-9999-build.xml-install.patch 11930 SHA256 3fb687a77f01d5534ee834bcca4457a3d876ba13e8e038ec3418a6ea35cf6a24 SHA512 993ee234a0f71c2d34d995998771d9f221737ec7ddae3a0b883b9ac2205ed1be902b404c90f5f3c98d2683c76b20dea9566ce984ac4e946853f89d9cbcd66a7f WHIRLPOOL 02da0b0729a11c0b5a17fe89aa751eaada9e71017f5b55eb78d8f20da567e3c4e84a9c9f41bb8d27e47ae5343f7ba212d88163f7e900adcab350693c77209989
+AUX alchemy.desktop 141 SHA256 4970db3d47daae3df17ebbabd9443f9b5bd325b6bc8d210d3b1f023538c55753 SHA512 6117975e5a62b98425384e8125c5965b499f357a8949bf163c19216fa4793912a6a25f9fa937c92dc9cccdd534e1756e5b5dd6905dab0bf620b7154f0ae979ca WHIRLPOOL a6d909d62a0f7c995cca6eb803aad3dbc72b9b0b39cfff7f4abb95a1461dfff08c0b0d5911fbf19167a31985658a55860680ea2dd5fde4c6a93a975267d6423e
+AUX build.xml 7956 SHA256 bf9a7bcdf797586180bcae951c2cfa67972fc0482a038167f00a08ae15ecb09b SHA512 3afef6dfaefe69648216c76166605c08b1a5650e504175ef40b6a09cda24d8f63dcd0cc4c2547beae444c95eb223e01bf1e7e4ed512b9af49e84a86a24c623a5 WHIRLPOOL 7ab592b852a48504ca5671209e4cb1ca9810200d0f9df09c3c9351099d2828bb34ba9e809d3fe24631327bc9a44c7c0304da99f7065af175048bf82578422fd9
+EBUILD alchemy-0.8.ebuild 1235 SHA256 aae7d92c7d22462c886774d011a50df24d4448eef096f7b0774b8d66bfe29a9b SHA512 51f9515514191565481048e76ca4ca0cb2e38f772c428140218ffceca2ffd92eeac42963d66137fdcc7545c1db21e1bbf3b44e2d7d90a6bbe9e6015fc001ab43 WHIRLPOOL 442bd564a33cc95e0fddc2884119734883f8c188ad57f98afabafbe76cde6c27c2bd02aa69b132ee893bd7b9b560eda3c90774fef96d4799f80db6a97d9deb53
+EBUILD alchemy-9999.ebuild 1235 SHA256 aae7d92c7d22462c886774d011a50df24d4448eef096f7b0774b8d66bfe29a9b SHA512 51f9515514191565481048e76ca4ca0cb2e38f772c428140218ffceca2ffd92eeac42963d66137fdcc7545c1db21e1bbf3b44e2d7d90a6bbe9e6015fc001ab43 WHIRLPOOL 442bd564a33cc95e0fddc2884119734883f8c188ad57f98afabafbe76cde6c27c2bd02aa69b132ee893bd7b9b560eda3c90774fef96d4799f80db6a97d9deb53
diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog
deleted file mode 100644
index 79791c8..0000000
--- a/media-libs/freeimage/ChangeLog
+++ /dev/null
@@ -1,118 +0,0 @@
-# ChangeLog for media-libs/freeimage
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.26 2013/03/21 15:48:09 bicatali Exp $
-
-*freeimage-3.15.4-r1 (17 May 2013)
-  
-  19 May 2013; Peter Asplund <peterasplund@gentoo.se> freeimage-3.15.4-r1.ebuild:
-  +files/freeimage-3.15.4-r1-datatypes.patch, +freeimage-3.15.4-r1.ebuild:
-  Fix for building with raw use-flag
-
-  21 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> freeimage-3.15.4.ebuild:
-  Keyword amd64-linux and x86-linux
-
-*freeimage-3.15.4 (19 Feb 2013)
-
-  19 Feb 2013; Mike Frysinger <vapier@gentoo.org>
-  +files/freeimage-3.15.4-unbundling.patch, +freeimage-3.15.4.ebuild:
-  Version bump.
-
-  14 Feb 2013; Agostino Sarubbo <ago@gentoo.org> freeimage-3.15.3-r2.ebuild:
-  Stable for x86, wrt bug #457120
-
-  14 Feb 2013; Agostino Sarubbo <ago@gentoo.org> freeimage-3.15.3-r2.ebuild:
-  Stable for amd64, wrt bug #457120
-
-  22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
-  -freeimage-3.15.3-r1.ebuild:
-  old
-
-*freeimage-3.15.3-r2 (10 Jan 2013)
-
-  10 Jan 2013; Mike Frysinger <vapier@gentoo.org>
-  +files/freeimage-3.15.3-r2-unbundling.patch, +freeimage-3.15.3-r2.ebuild:
-  Make all the graphics libs optional via USE flags.
-
-*freeimage-3.15.3-r1 (09 Jan 2013)
-
-  09 Jan 2013; Mike Frysinger <vapier@gentoo.org>
-  +files/freeimage-3.15.3-r1-unbundling.patch, +freeimage-3.15.3-r1.ebuild:
-  Update to EAPI=4.  Add IUSE=static-libs support.  Respect $PKG_CONFIG.  Use
-  $CXX to link rather than $CC -lstdc++ since that does not work for everything.
-  Respect $CXXFLAGS when linking.
-
-  24 Jul 2012; Tupone Alfredo <tupone@gentoo.org> freeimage-3.15.3.ebuild:
-  Add depend on pkgconfig. Bug #427676 by Julian Ospald
-
-  08 Jun 2012; Zac Medico <zmedico@gentoo.org> freeimage-3.15.3.ebuild:
-  inherit multilib for get_libdir
-
-  22 Apr 2012; Markus Meier <maekke@gentoo.org> freeimage-3.15.3.ebuild:
-  x86 stable, bug #412673
-
-  21 Apr 2012; Agostino Sarubbo <ago@gentoo.org> freeimage-3.15.3.ebuild:
-  Stable for amd64, wrt bug #412673
-
-  13 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org>
-  -files/freeimage-3.15.2-unbundling.patch, -freeimage-3.15.1.ebuild,
-  -freeimage-3.15.2.ebuild:
-  old
-
-*freeimage-3.15.3 (18 Mar 2012)
-
-  18 Mar 2012; Tupone Alfredo <tupone@gentoo.org> +freeimage-3.15.3.ebuild,
-  +files/freeimage-3.15.3-unbundling.patch:
-  Version bump to 3.15.3
-
-*freeimage-3.15.2 (06 Mar 2012)
-
-  06 Mar 2012; Tupone Alfredo <tupone@gentoo.org> +freeimage-3.15.2.ebuild,
-  +files/freeimage-3.15.2-unbundling.patch:
-  Version bump to 3.15.2
-
-*freeimage-3.15.1 (12 Feb 2012)
-
-  12 Feb 2012; Tupone Alfredo <tupone@gentoo.org> +freeimage-3.15.1.ebuild,
-  +metadata.xml:
-  Reviving package with version 3.15.1
-
-  24 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
-  freeimage-3.11.0.ebuild:
-  Use append-cflags from flag-o-matic
-
-  12 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
-  freeimage-3.11.0.ebuild:
-  EAPI=2; Skip calling ldconfig during install (bug #269493); silence gcc warnings
-
-  02 Apr 2009; Tristan Heaven <nyhm@gentoo.org> freeimage-3.11.0.ebuild:
-  Build with -fPIC, bug #252766
-
-  01 Apr 2009; Joseph Jezak <josejx@gentoo.org> freeimage-3.11.0.ebuild:
-  Marked ppc stable for bug #252766.
-
-  25 Nov 2008; Tristan Heaven <nyhm@gentoo.org> freeimage-3.11.0.ebuild:
-  Add cxx USE flag, bug #242888
-
-*freeimage-3.11.0 (02 Sep 2008)
-
-  02 Sep 2008; Tristan Heaven <nyhm@gentoo.org> +freeimage-3.11.0.ebuild:
-  Version bump, bug #213969
-
-  04 May 2007; Matti Bickel <mabi@gentoo.org> freeimage-3.9.3-r1.ebuild:
-  keyworded ~ppc (bug #174055)
-
-*freeimage-3.9.3-r1 (22 Apr 2007)
-
-  22 Apr 2007; Tristan Heaven <nyhm@gentoo.org>
-  +files/freeimage-3.9.3-sys-headers.patch, +freeimage-3.9.3-r1.ebuild:
-  Fix jpeg image loading, bug #175467
-
-  10 Apr 2007; Peter Weller <welp@gentoo.org> freeimage-3.9.3.ebuild:
-  Keyworded amd64 wrt bug 174055
-
-*freeimage-3.9.3 (31 Mar 2007)
-
-  31 Mar 2007; Tristan Heaven <nyhm@gentoo.org>
-  +files/freeimage-3.9.3-build.patch, +metadata.xml,
-  +freeimage-3.9.3.ebuild:
-  Initial commit, bug #165938
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
deleted file mode 100644
index f460d53..0000000
--- a/media-libs/freeimage/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX freeimage-3.15.3-r1-unbundling.patch 8855 SHA256 e4fcf7c853ffa8ad59f09e09c53c9eb23eb2589ce16e6facb423ac6c74b6eb71 SHA512 d8b69f8add6016ee0204b4916608d17888f6945e8c67cc89b3e5846bbf945443c58a3b096697e0d3018c993fb6b54f59e95db71619fc481c4f1f54da5c10adb1 WHIRLPOOL f7f916fae38ba5630132b67f343fa9e5b95940864bd2bb12340c0be0c3eaefa1a1c6f279f5e03c09f0add70a9ec949bab2ef10e88fcb5bc132d97814e7faf04e
-AUX freeimage-3.15.3-r2-unbundling.patch 17182 SHA256 8fe72d50ca18b98041d70e8bd53dc681b6c59dbdf1ac142e01233009a5e6e452 SHA512 473d9ede61b1edeac78ff7b460949247f245cda67dc514c96f4bde957aa7f94cb4cad39dd7165719b58a956a1ec754204af5798b41ff0bd9379a06fd2b31a910 WHIRLPOOL f15e13ffefa477434970a3172b3c6a464f77ae390ccff9ae1e089721cf926a78ac17967b11c599d4d80ee31231b070f9e604803e956b4db8d565d46f985b015c
-AUX freeimage-3.15.3-unbundling.patch 9053 SHA256 b98d92187eb34518a6219a45f0a71e0cc7909df7583b886069392264d4cc2ff4 SHA512 02f6bfd62bb54370d65660249bf7fa7e27dea0aeeabea782a47748baad119f6635ac5954449989aa487deda27739ad6dd8db42e287e3e1e70b211495b0643650 WHIRLPOOL ed2b4e7c0208a2d8e1177f3ff09e8d2a108ab57721846ec06ee68546ca591929f8df4130b327d66e384b63eef201ee955eb2fe7a5309a9b302494c5ce0c6878e
-AUX freeimage-3.15.4-datatypes.patch 378 SHA256 e2bdf2d062ae8d9f41dff320e86bf64361589080ed4b9ccb95b3c8b154700ab6 SHA512 851f14e3df7c6b84bf88f285d1c6d4c7898b560446def6ce9efb0734ab25083a24766c8dec0bf0a52880173e543e5c5b162eba4a59162763a8761dc12167a9a9 WHIRLPOOL 365771d807b3d250685f727f2d3ba4dd16e248a8f12fa6b59162bbf06f3fcccfe0c835e03e2242071d2d4ac92603129535184283316fd38fb4631e47b6220990
-AUX freeimage-3.15.4-unbundling.patch 17182 SHA256 929f45e21c5be7751f21b9f4d98a3c2ae248559ac371e053d66e4d8905eecf78 SHA512 b9f7b2f1767eabe3db44a4328d4211ee80ba719d4f2715f7bb7988f19029d5867da068c78a02f50bf513fc7b88da857795fd0fc0eb9b837f3f999e8951b2debd WHIRLPOOL 62137afc748227b98145c7625fe26348c6bfb21dd569e3b9b095a69c7d503ecfc99c52b40dfdd0dd9b83415fc70f9d03aba168bc98025e6b360522073f1d42b4
-DIST FreeImage3154.pdf 1007480 SHA256 455b0ba7cf571f3fc3027681a70abf3c2321d0a4fd7956c5ba58bd7ccb7b5373 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28 WHIRLPOOL a1e8b575d198b61e74db9eb31e9472460158e86989ed822c156cae3f625f6ea0d156e4b7ddffc8b7a1d16a601be39b4cf0e20558d36bb4dd73195fea4faa43e7
-DIST FreeImage3154.zip 5513923 SHA256 eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829 SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc WHIRLPOOL 2747bb7a35d8de24a1a876616626a9e840495f06da836ce15135aafaa21bc1d8d9cece17f7512424b66edfcc521ed096ea85da5ea5b5b90b4c032bf080356b4d
-EBUILD freeimage-3.15.4-r1.ebuild 2627 SHA256 83ff1e09f774bd936d2b08d938c0988a52b697c76d4ab19eb86af82e11467161 SHA512 e240b85b68e0bc1ab02bc12aeddec71730ed968d2532e839dc5edf4f8f624186e5cf7cb28d1be7ef9413ea6e720512091eb65af00d841c5b30bd18073bba3075 WHIRLPOOL a09f86d8ce6d9965f70a14ffcf8c3cf4d43ae226d11d3398af12a53bcf032ec91de06f145b0ec09513a3e42f577c3e4ddf3f80ff373f6201ad800b8992d8a870
-MISC ChangeLog 3867 SHA256 971b19e6a07d5d2be9a2f0b9a2d94991331c23a487b85822b9f9c351d7d4f70a SHA512 aff7916751f9b676d8e6fb9379b7a3ef4eeda5a78c63d8f75a0aa74994ff705f91aecdfa6257787121b6ae1d63e9ef14bee3b246b1adadd4e226abeb16787569 WHIRLPOOL e90b6b74326e4eb4bc6cc094b6686c744628cbde75ba31a2cd6be65ddf89e00fcd43755f13f6e9556987fbb597f8aada5aeaac9750f288dedb74c6e5fbc56e42
-MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-datatypes.patch b/media-libs/freeimage/files/freeimage-3.15.4-datatypes.patch
deleted file mode 100644
index 93cdbaa..0000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-datatypes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- FreeImage/Source/FreeImage.h.orig	2013-03-10 21:48:08.000000000 +0400
-+++ FreeImage/Source/FreeImage.h	2013-03-10 21:48:29.637324387 +0400
-@@ -141,8 +141,10 @@
- typedef uint16_t WORD;
- typedef uint32_t DWORD;
- typedef int32_t LONG;
-+#ifndef _LIBRAW_TYPES_H
- typedef int64_t INT64;
- typedef uint64_t UINT64;
-+#endif
- #else
- // MS is not C99 ISO compliant
- typedef long BOOL;
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch b/media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch
deleted file mode 100644
index f770b7e..0000000
--- a/media-libs/freeimage/files/freeimage-3.15.4-unbundling.patch
+++ /dev/null
@@ -1,639 +0,0 @@
-lots of fixes here:
-	- use system graphics libraries
-	- make all of them optional
-	- drop root users from install (fix user installs)
-	- make static lib build optional
-	- link with CXX and CXXFLAGS (since this is C++ code)
-
---- Makefile.gnu
-+++ Makefile.gnu
-@@ -11,7 +11,24 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -64,13 +81,15 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- #	ldconfig
---- Source/FreeImage/J2KHelper.cpp
-+++ Source/FreeImage/J2KHelper.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- /**
- Divide an integer by a power of 2 and round upwards
---- Source/FreeImage/PluginEXR.cpp
-+++ Source/FreeImage/PluginEXR.cpp
-@@ -22,16 +22,16 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../OpenEXR/IlmImf/ImfIO.h"
--#include "../OpenEXR/Iex/Iex.h"
--#include "../OpenEXR/IlmImf/ImfOutputFile.h"
--#include "../OpenEXR/IlmImf/ImfInputFile.h"
--#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
--#include "../OpenEXR/IlmImf/ImfChannelList.h"
--#include "../OpenEXR/IlmImf/ImfRgba.h"
--#include "../OpenEXR/IlmImf/ImfArray.h"
--#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
--#include "../OpenEXR/Half/half.h"
-+#include <ImfIO.h>
-+#include <Iex.h>
-+#include <ImfOutputFile.h>
-+#include <ImfInputFile.h>
-+#include <ImfRgbaFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfRgba.h>
-+#include <ImfArray.h>
-+#include <ImfPreviewImage.h>
-+#include <half.h>
- 
- 
- // ==========================================================
---- Source/FreeImage/PluginJ2K.cpp
-+++ Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- Source/FreeImage/PluginJP2.cpp
-+++ Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- 
- // ==========================================================
- // Plugin Interface
---- Source/FreeImage/PluginPNG.cpp
-+++ Source/FreeImage/PluginPNG.cpp
-@@ -37,8 +37,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
---- Source/transupp.c
-+++ Source/transupp.c
-@@ -15,8 +15,7 @@
- /* Although this file really shouldn't have access to the library internals,
-  * it's helpful to let it call jround_up() and jcopy_block_row().
-  */
--#define JPEG_INTERNALS
--
-+#include <jerror.h>
- #include "jinclude.h"
- #include "jpeglib.h"
- #include "transupp.h"		/* My own external interface */
---- Source/FreeImage/ZLibInterface.cpp
-+++ Source/FreeImage/ZLibInterface.cpp
-@@ -19,10 +19,10 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../ZLib/zlib.h"
-+#include <zlib.h>
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
-+#define OS_CODE 0x03
- 
- /**
- Compresses a source buffer into a target buffer, using the ZLib library. 
---- Source/FreeImage/PluginG3.cpp
-+++ Source/FreeImage/PluginG3.cpp
-@@ -20,7 +20,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- 
- #include "FreeImage.h"
- #include "Utilities.h"
---- Source/FreeImage/PluginJPEG.cpp
-+++ Source/FreeImage/PluginJPEG.cpp
-@@ -35,11 +35,15 @@
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <string.h>
-+#include <stdio.h>
-+#include <jconfig.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
- 
-+#define SIZEOF(object)        ((size_t) sizeof(object))
-+
- #include "FreeImage.h"
- #include "Utilities.h"
- 
---- Source/FreeImageToolkit/JPEGTransform.cpp
-+++ Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -25,10 +25,11 @@
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
--#include "../LibJPEG/transupp.h"
-+#include <string.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
-+#include "transupp.h"
- }
- 
- #include "FreeImage.h"
---- Makefile.fip
-+++ Makefile.fip
-@@ -11,7 +11,24 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+PKG_CONFIG ?= pkg-config
-+
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
-+LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
-+LIBRARIES-$(USE_EXR)    += $(shell $(PKG_CONFIG) --libs OpenEXR)
-+LIBRARIES-$(USE_JPEG)   += -ljpeg
-+LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjpeg)
-+LIBRARIES-$(USE_MNG)    += -lmng
-+LIBRARIES-$(USE_PNG)    += $(shell $(PKG_CONFIG) --libs libpng)
-+LIBRARIES-$(USE_TIFF)   += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
-+LIBRARIES-$(USE_RAW)    += $(shell $(PKG_CONFIG) --libs libraw)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -65,14 +82,18 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+ifneq ($(STATICLIB),)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+endif
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
-+	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-+	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
---- Makefile.srcs
-+++ Makefile.srcs
-@@ -1,6 +1,14 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 15.4
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/FreeImage.cpp \
-@@ -17,36 +25,74 @@ SRCS = \
- 	Source/FreeImage/GetType.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
-@@ -83,7 +129,11 @@ SRCS = \
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -92,10 +142,18 @@ SRCS = \
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+SRCS = $(SRCS-yes)
- INCLS = \
- 	Examples/OpenGL/TextureManager/TextureManager.h \
- 	Examples/Plugin/PluginCradle.h \
-@@ -116,7 +174,17 @@
- 	Wrapper/FreeImagePlus/test/fipTest.h \
- 	TestAPI/TestSuite.h
- 
--INCLUDE = -I. \
-+INCLUDE-yes = -I. \
- 	-ISource \
- 	-ISource/Metadata \
- 	-ISource/FreeImageToolkit \
-+
-+INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
-+INCLUDE-$(USE_EXR)    += -DUSE_EXR    $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
-+INCLUDE-$(USE_JPEG)   += -DUSE_JPEG
-+INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjpeg)
-+INCLUDE-$(USE_MNG)    += -DUSE_MNG
-+INCLUDE-$(USE_PNG)    += -DUSE_PNG    $(shell $(PKG_CONFIG) --cflags-only-I libpng)
-+INCLUDE-$(USE_TIFF)   += -DUSE_TIFF   $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
-+INCLUDE-$(USE_RAW)    += -DUSE_RAW    $(shell $(PKG_CONFIG) --cflags-only-I libraw)
-+INCLUDE = $(INCLUDE-yes)
---- fipMakefile.srcs
-+++ fipMakefile.srcs
-@@ -1,6 +1,14 @@
-+USE_EXR ?= yes
-+USE_JPEG ?= yes
-+USE_JPEG2K ?= yes
-+USE_MNG ?= yes
-+USE_PNG ?= yes
-+USE_TIFF ?= yes
-+USE_RAW ?= yes
-+
- VER_MAJOR = 3
- VER_MINOR = 15.4
--SRCS = \
-+SRCS-yes = \
- 	Source/FreeImage/BitmapAccess.cpp \
- 	Source/FreeImage/ColorLookup.cpp \
- 	Source/FreeImage/FreeImage.cpp \
-@@ -9,36 +17,74 @@
- 	Source/FreeImage/GetType.cpp \
- 	Source/FreeImage/MemoryIO.cpp \
- 	Source/FreeImage/PixelAccess.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/J2KHelper.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/MNGHelper.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/Plugin.cpp \
- 	Source/FreeImage/PluginBMP.cpp \
- 	Source/FreeImage/PluginCUT.cpp \
- 	Source/FreeImage/PluginDDS.cpp \
-+
-+SRCS-$(USE_EXR) += \
- 	Source/FreeImage/PluginEXR.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginG3.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginGIF.cpp \
- 	Source/FreeImage/PluginHDR.cpp \
- 	Source/FreeImage/PluginICO.cpp \
- 	Source/FreeImage/PluginIFF.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJ2K.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginJNG.cpp \
-+
-+SRCS-$(USE_JPEG2K) += \
- 	Source/FreeImage/PluginJP2.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImage/PluginJPEG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginKOALA.cpp \
-+
-+SRCS-$(USE_MNG) += \
- 	Source/FreeImage/PluginMNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPCD.cpp \
- 	Source/FreeImage/PluginPCX.cpp \
- 	Source/FreeImage/PluginPFM.cpp \
- 	Source/FreeImage/PluginPICT.cpp \
-+
-+SRCS-$(USE_PNG) += \
- 	Source/FreeImage/PluginPNG.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginPNM.cpp \
- 	Source/FreeImage/PluginPSD.cpp \
- 	Source/FreeImage/PluginRAS.cpp \
-+
-+SRCS-$(USE_RAW) += \
- 	Source/FreeImage/PluginRAW.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginSGI.cpp \
- 	Source/FreeImage/PluginTARGA.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/FreeImage/PluginTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImage/PluginWBMP.cpp \
- 	Source/FreeImage/PluginXBM.cpp \
- 	Source/FreeImage/PluginXPM.cpp \
-@@ -75,7 +121,11 @@
- 	Source/Metadata/IPTC.cpp \
- 	Source/Metadata/TagConversion.cpp \
- 	Source/Metadata/TagLib.cpp \
-+
-+SRCS-$(USE_TIFF) += \
- 	Source/Metadata/XTIFF.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/Background.cpp \
- 	Source/FreeImageToolkit/BSplineRotate.cpp \
- 	Source/FreeImageToolkit/Channels.cpp \
-@@ -84,7 +134,11 @@
- 	Source/FreeImageToolkit/CopyPaste.cpp \
- 	Source/FreeImageToolkit/Display.cpp \
- 	Source/FreeImageToolkit/Flip.cpp \
-+
-+SRCS-$(USE_JPEG) += \
- 	Source/FreeImageToolkit/JPEGTransform.cpp \
-+
-+SRCS-yes += \
- 	Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
- 	Source/FreeImageToolkit/Rescale.cpp \
- 	Source/FreeImageToolkit/Resize.cpp \
-@@ -95,6 +149,11 @@
- 	Wrapper/FreeImagePlus/src/fipTag.cpp \
- 	Wrapper/FreeImagePlus/src/fipWinImage.cpp \
- 	Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
-+
-+SRCS-$(USE_JPEG) += \
-+	Source/transupp.c
-+
-+SRCS = $(SRCS-yes)
- INCLUDE = -I. \
- 	-ISource \
- 	-ISource/Metadata \
---- Source/FreeImage/PluginRAW.cpp
-+++ Source/FreeImage/PluginRAW.cpp
-@@ -19,7 +19,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibRawLite/libraw/libraw.h"
-+#include <libraw.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
---- Source/Metadata/XTIFF.cpp
-+++ Source/Metadata/XTIFF.cpp
-@@ -29,7 +29,7 @@
- #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
- #endif
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- 
- #include "FreeImage.h"
- #include "Utilities.h"
---- Source/FreeImage/PluginTIFF.cpp
-+++ Source/FreeImage/PluginTIFF.cpp
-@@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include "tiffiop.h"
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include <half.h>
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
---- Source/tiffiop.h
-+++ Source/tiffiop.h
-@@ -30,7 +30,9 @@
-  * ``Library-private'' definitions.
-  */
- 
--#include "tif_config.h"
-+#include <tiffconf.h>
-+#define HAVE_SEARCH_H
-+#define HAVE_FCNTL_H
- 
- #ifdef HAVE_FCNTL_H
- # include <fcntl.h>
---- Source/FreeImage/Plugin.cpp
-+++ Source/FreeImage/Plugin.cpp
-@@ -223,23 +223,33 @@
- 			*/
- 			s_plugins->AddNode(InitBMP);
- 			s_plugins->AddNode(InitICO);
-+#ifdef USE_JPEG
- 			s_plugins->AddNode(InitJPEG);
-+#endif
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitJNG);
-+#endif
- 			s_plugins->AddNode(InitKOALA);
- 			s_plugins->AddNode(InitIFF);
-+#ifdef USE_MNG
- 			s_plugins->AddNode(InitMNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
- 			s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
- 			s_plugins->AddNode(InitPCD);
- 			s_plugins->AddNode(InitPCX);
- 			s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
- 			s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
-+#ifdef USE_PNG
- 			s_plugins->AddNode(InitPNG);
-+#endif
- 			s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
- 			s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
- 			s_plugins->AddNode(InitRAS);
- 			s_plugins->AddNode(InitTARGA);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitTIFF);
-+#endif
- 			s_plugins->AddNode(InitWBMP);
- 			s_plugins->AddNode(InitPSD);
- 			s_plugins->AddNode(InitCUT);
-@@ -248,14 +258,22 @@
- 			s_plugins->AddNode(InitDDS);
- 	        s_plugins->AddNode(InitGIF);
- 	        s_plugins->AddNode(InitHDR);
-+#ifdef USE_TIFF
- 			s_plugins->AddNode(InitG3);
-+#endif
- 			s_plugins->AddNode(InitSGI);
-+#ifdef USE_EXR
- 			s_plugins->AddNode(InitEXR);
-+#endif
-+#ifdef USE_JPEG2K
- 			s_plugins->AddNode(InitJ2K);
- 			s_plugins->AddNode(InitJP2);
-+#endif
- 			s_plugins->AddNode(InitPFM);
- 			s_plugins->AddNode(InitPICT);
-+#ifdef USE_RAW
- 			s_plugins->AddNode(InitRAW);
-+#endif
- 			
- 			// external plugin initialization
- 
diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
deleted file mode 100644
index e7fe915..0000000
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4-r1.ebuild,v 1.2 2013/03/21 15:48:09 bicatali Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils multilib
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	mng? ( media-libs/libmng )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	raw? ( media-libs/libraw )
-	tiff? (
-		media-libs/ilmbase
-		media-libs/tiff
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	cd Source
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
-	cd ..
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		Makefile.srcs fipMakefile.srcs || die
-	epatch "${FILESDIR}"/${PN}-3.15.4-unbundling.patch
-	epatch "${FILESDIR}"/${PN}-3.15.4-datatypes.patch
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf
-}
diff --git a/media-plugins/gimp-normalmap/Manifest b/media-plugins/gimp-normalmap/Manifest
index 66b8532..28bd2a6 100644
--- a/media-plugins/gimp-normalmap/Manifest
+++ b/media-plugins/gimp-normalmap/Manifest
@@ -1,4 +1,4 @@
 DIST gimp-normalmap-1.2.2.tar.bz2 143698 SHA256 e0029552dd0f25396de68ed7009e65da2d6ac3913903bd2b67767ffe69a0674e SHA512 00b7ab8746d8c2979009a80f540fdfabfe19447d11e2fc2aab6721975f53101284f83ad514d40d72675845dcf4c55a1faae65119843b71f9ae02d3619df52d44 WHIRLPOOL 7d68dd6eaeae9371023f739e0f0183415287a229888b85bede683defc2a06926aebf12a96e2dc154a2bf2e19b5e4a88eda377ed5caa2b70db771862c7626c17a
-EBUILD gimp-normalmap-1.2.2-r1.ebuild 995 SHA256 2b5073d2f5d657da7706834447d61cfbf9035387f1db63179fbe12817d8a4209 SHA512 e44244f7e32990312669c000444679897a126ad225a8dd1b1dbd36b215586b3788b0b741afaf51e4d8609cfdc5f092670b319bb8dbfb68a4377b486139bc838c WHIRLPOOL bdf7f7b61a5679b4f5aa02ac8068160db4a1edf85fa05814011f2496ce7f551edd1d5d51741875daae75aed7ab9f907e5a2b7f7bf1d7923c6f1c24433baaecd3
+EBUILD gimp-normalmap-1.2.2-r1.ebuild 995 SHA256 9e15f85e6a1cc32ae6d43979e93f0ead9f4c8152f6fa6a786aaac34a7869b28c SHA512 a4d144a54d4e3384d5c7a10d410dcf5bebf0df1c20396d4846941954b8050120b34e5098da02079c1ecfbc5d71c6a4f9db4e95019565bcea9b567b4b95a5b472 WHIRLPOOL d22e34c4628537c671b2bec2649e6b56581e013d8320182609e80e1843a3c0cea5d70a787568b1ccacadce60b6e08e3fd5c55abc18ebc7bafe2469e36a961bda
 MISC ChangeLog 791 SHA256 d16120e2a4c034a58cdecb8c2d1d5ec2fe83414882be6293a86e2f31abfee57c SHA512 49622e50e95ef1e07ca6665bb6eb5a87b6301a9123fe68773ada007df769f6309485082899a17cedf44fbad51099da0fc00ad6218e8a742285f4ddf11adb0fbd WHIRLPOOL d283ff179ca9ca0c2a107480c8f889a6b2dfeeff5b37a4fadf63929657c25e449ecf5bc4873b361c8b5a28becbe93cf042c0ae843044990c4d9c81380342a85b
 MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/media-sound/morituri/Manifest b/media-sound/morituri/Manifest
index d460c2a..6233ca0 100644
--- a/media-sound/morituri/Manifest
+++ b/media-sound/morituri/Manifest
@@ -1,2 +1,3 @@
 DIST v0.2.0.tar.gz 183202 SHA256 878bea49b63b50161cf17adce61e5ece83f420b857568ad5d608f1ee4cae1072 SHA512 6dd000433b874c6c2f7c0ed8d0e9f9d997624d4fe1e6e7addd6a9f600d9137ca8a5f58a7f77a2fe3c1202478c728f2a8ff455ca944d4820f76d8ef54437a7626 WHIRLPOOL f478274a1bfedf88f3f112034d308cda88992fb3f7f0238b4e473f4cb9942c0abceed06a5270e2ffd411fc723b1df8648f54ec78bc8e8d9f5ff77326c282ea8f
-EBUILD morituri-0.2.0.ebuild 1136 SHA256 0587612588e50d638204e5048283f04b91829a6297dc6265f7625ffc91e2e113 SHA512 8a51c7589ba10c8f9132c7a537485e71906dd8b5cbd0fb9bba6d2522a7502576dc181f2d547a5b5295ff5810cf57f23bb9eab4b721c31887a4122abccecf1808 WHIRLPOOL ef3b3e3750a069c1f9337f5c58f255dd1ab1e83133913e178297a53b71914fe5b7ceb7b1ce23407c3e3e57b4ce8e6ac9b2e5b3ac88e2bb44b159144e52ecaa61
+EBUILD morituri-0.2.0.ebuild 1558 SHA256 9522c8aee2473117b55bcb2153914c54ae194d5b8b8b0c49f2f488520e36b16e SHA512 7052abc17098079b56a1378e3ecb2c759b9fd63d112780f22b85ed7e0b961535527d6314aa0437e8fdd8320a0fce6fd65d5ec75cb25a38ca7afe056743bc7b99 WHIRLPOOL b0e598d39706e2e65587730d0b268ff7e0372d5f0c073dbcef509a9ab1614353c290b383be45b9bc062b35fcd0050281f1b7af4ef777dd4dc880ef19b261325a
+EBUILD morituri-9999.ebuild 1492 SHA256 79701f9f085b1c9ecbd8df90ccd86c2bdd70d07b6740f89941e8b5bce17068af SHA512 20d16c21bb8aea372398665dfd77de2c4c6f486f46072d49747c2e66413a7c34f6f47851c7563c0d399ca929be5b0e34a45a9aa4c166ed9abcdb1936cb658380 WHIRLPOOL 62e30a218d27e363713e3249e30e7e13050d9f4175f39e638d562265d8482cd9c3c6d69a8bd9c2177f5a328773139f6481a711019588d0cc9ef2d228ae177782
diff --git a/media-sound/morituri/morituri-0.2.0.ebuild b/media-sound/morituri/morituri-0.2.0.ebuild
index 1d1ce75..0075f60 100644
--- a/media-sound/morituri/morituri-0.2.0.ebuild
+++ b/media-sound/morituri/morituri-0.2.0.ebuild
@@ -2,53 +2,65 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI="5"
 
 PYTHON_COMPAT="python2_7"
 
-inherit bash-completion-r1 python-single-r1 eutils autotools
+inherit bash-completion-r1 python-single-r1 eutils autotools git-2
 
 DESCRIPTION="A CD ripper aiming for accuracy over speed."
 HOMEPAGE="http://thomas.apestaart.org/morituri/trac/"
 SRC_URI="https://github.com/thomasvs/${PN}/archive/v${PV}.tar.gz"
 
+EGIT_REPO_URI="git://github.com/thomasvs/morituri.git"
+EGIT_HAS_SUBMODULES=1
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="cdio doc test"
+IUSE="alac cdio doc +cddb +flac test wav wavpack"
 
-DEPEND="media-sound/cdparanoia
+RDEPEND="media-sound/cdparanoia
+	media-plugins/gst-plugins-cdparanoia
 	app-cdr/cdrdao
 	media-libs/gstreamer
-	dev-python/gst-python
-	media-plugins/gst-plugins-cdparanoia
 	>=media-libs/gst-plugins-base-0.10.22
+	alac? ( media-plugins/gst-plugins-ffmpeg )
+	cdio? ( dev-python/pycdio )
+	cddb? ( dev-python/cddb-py )
+	flac? ( media-plugins/gst-plugins-flac )
+	wav? ( media-libs/gst-plugins-good )
+	wavpack? ( media-plugins/gst-plugins-wavpack )
+	doc? ( dev-python/epydoc )
+	test? ( dev-python/pychecker )
+	dev-python/gst-python
 	dev-python/python-musicbrainz
 	dev-python/python-musicbrainz-ngs
 	dev-python/pygobject
 	dev-python/pygtk
-	dev-python/setuptools
-	dev-python/cddb-py
-	doc? ( dev-python/epydoc )
-	cdio? ( dev-python/pycdio )
-	test? ( dev-python/pychecker )"
-RDEPEND="${DEPEND}"
+	dev-python/pyxdg"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	default
+	eautoreconf
 }
 
 src_configure() {
-	default
-}
+	# disable doc building
+	local ac_cv_prog_EPYDOC=""
+
+	# disable test
+	local ac_cv_prog_PYCHECKER=""
 
-src_compile() {
 	default
 }
 
 src_install() {
 	default
 
+	python_doscript bin/rip
+
+	rm -rf "${D}/etc" || die
 	dobashcomp etc/bash_completion.d/rip
 
 	dodoc AUTHORS HACKING NEWS README RELEASE TODO
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
new file mode 100644
index 0000000..848e6b9
--- /dev/null
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -0,0 +1,800 @@
+# ChangeLog for x11-misc/xkeyboard-config
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.192 2013/10/08 05:09:09 ago Exp $
+
+  26 Oct 2013; Peter Asplund <peterasplund@gentoo.se> xkeyboard-config-2.10.1-r1.ebuild:
+  Add Svorak A5 layout, wrt bug #486978
+
+  08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for x86, wrt bug #475480
+
+  07 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for sparc, wrt bug #475480
+
+  06 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for ia64, wrt bug #475480
+
+  05 Oct 2013; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.9.ebuild:
+  arm stable, bug #475480
+
+  05 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for alpha, wrt bug #475480
+
+  04 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for ppc64, wrt bug #475480
+
+*xkeyboard-config-2.10.1 (04 Oct 2013)
+
+  04 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.10.1.ebuild:
+  Version bump.
+
+  03 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for ppc, wrt bug #475480
+
+  02 Oct 2013; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for HPPA (bug #475480).
+
+  29 Sep 2013; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.9.ebuild:
+  Stable for amd64, wrt bug #475480
+
+*xkeyboard-config-2.9 (01 Jun 2013)
+
+  01 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.9.ebuild:
+  Version bump.
+
+  25 Feb 2013; Zac Medico <zmedico@gentoo.org> xkeyboard-config-2.8.ebuild:
+  Add ~arm-linux keyword.
+
+*xkeyboard-config-2.8 (30 Jan 2013)
+
+  30 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.8.ebuild,
+  -files/xkeyboard-config-2.4.1-extended-function-keys.patch,
+  -files/xkeyboard-config-2.4.1-shift-backspace.patch,
+  -files/xorg-cve-2012-0064.patch, -xkeyboard-config-2.1.ebuild,
+  -xkeyboard-config-2.2.1-r1.ebuild, -xkeyboard-config-2.3.ebuild,
+  -xkeyboard-config-2.4.1-r2.ebuild, -xkeyboard-config-2.4.1-r3.ebuild,
+  -xkeyboard-config-2.5.1.ebuild, -xkeyboard-config-2.5.ebuild:
+  Version bump. Switch to EAPI=5 and drop old.
+
+  04 Jan 2013; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for HPPA (bug #440872).
+
+  01 Jan 2013; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.7.ebuild:
+  s390/sh stable wrt #440872
+
+  30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for alpha, wrt bug #440872
+
+  28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for sparc, wrt bug #440872
+
+  28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for ia64, wrt bug #440872
+
+  17 Dec 2012; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.7.ebuild:
+  arm stable, bug #440872
+
+  08 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for ppc64, wrt bug #440872
+
+  28 Nov 2012; Brent Baude <ranger@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Marking xkeyboard-config-2.7 ppc stable for bug 440872
+
+  18 Nov 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for x86, wrt bug #440872
+
+  16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.7.ebuild:
+  Stable for amd64, wrt bug #440872
+
+*xkeyboard-config-2.7 (27 Sep 2012)
+
+  27 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.7.ebuild, xkeyboard-config-2.4.1-r2.ebuild:
+  Version bump.
+
+  26 Aug 2012; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.6.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #419473
+
+  12 Jul 2012; Brent Baude <ranger@gentoo.org> xkeyboard-config-2.6.ebuild:
+  Marking xkeyboard-config-2.6 ppc stable for bug 419473
+
+  11 Jul 2012; Brent Baude <ranger@gentoo.org> xkeyboard-config-2.6.ebuild:
+  Marking xkeyboard-config-2.6 ppc64 stable for bug 419473
+
+  29 Jun 2012; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.6.ebuild:
+  arm stable, bug #419473
+
+  28 Jun 2012; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.6.ebuild:
+  Stable for HPPA (bug #419473).
+
+  24 Jun 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.6.ebuild:
+  Stable for x86, wrt bug #419473
+
+  22 Jun 2012; Agostino Sarubbo <ago@gentoo.org> xkeyboard-config-2.6.ebuild:
+  Stable for amd64, wrt bug #419473
+
+*xkeyboard-config-2.6 (30 May 2012)
+
+  30 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.6.ebuild:
+  Version bump.
+
+  10 May 2012; Alexis Ballier <aballier@gentoo.org>
+  xkeyboard-config-2.5.1.ebuild:
+  keyword ~amd64-fbsd
+
+  03 Mar 2012; Brent Baude <ranger@gentoo.org>
+  xkeyboard-config-2.4.1-r3.ebuild:
+  Marking xkeyboard-config-2.4.1-r3 ppc64 stable for bug 394393
+
+  19 Feb 2012; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-2.4.1-r3.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #394393
+
+  15 Feb 2012; Brent Baude <ranger@gentoo.org>
+  xkeyboard-config-2.4.1-r3.ebuild:
+  Marking xkeyboard-config-2.4.1-r3 ppc stable for bug 394393
+
+*xkeyboard-config-2.5.1 (01 Feb 2012)
+
+  01 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xkeyboard-config-2.5.1.ebuild:
+  Version bump.
+
+  24 Jan 2012; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-2.4.1-r3.ebuild:
+  Stable for HPPA (bug #399347).
+
+*xkeyboard-config-2.5 (20 Jan 2012)
+
+  20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xkeyboard-config-2.5.ebuild:
+  Version bump.
+
+  19 Jan 2012; Michael Weber <xmw@gentoo.org> xkeyboard-config-2.4.1-r3.ebuild:
+  arm stable (security bug 399347)
+
+  19 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xkeyboard-config-2.4.1-r3.ebuild:
+  x86 stable wrt security bug #399347
+
+  19 Jan 2012; Agostino Sarubbo <ago@gentoo.org>
+  xkeyboard-config-2.4.1-r3.ebuild:
+  Stable for AMD64, wrt security bug #399347
+
+*xkeyboard-config-2.4.1-r3 (19 Jan 2012)
+
+  19 Jan 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.4.1-r3.ebuild, +files/xorg-cve-2012-0064.patch:
+  Add patch for security bug #399347.
+
+  27 Dec 2011; Markus Meier <maekke@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  x86 stable, bug #394393
+
+  21 Dec 2011; Markus Meier <maekke@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  arm stable, bug #394393
+
+  20 Dec 2011; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  Stable for HPPA (bug #394393).
+
+  20 Dec 2011; Agostino Sarubbo <ago@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  Stable for AMD64, wrt bug #394393
+
+*xkeyboard-config-2.4.1-r2 (20 Nov 2011)
+
+  20 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.1-r1.ebuild, +xkeyboard-config-2.4.1-r2.ebuild,
+  +files/xkeyboard-config-2.4.1-shift-backspace.patch:
+  Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
+
+*xkeyboard-config-2.4.1-r1 (14 Oct 2011)
+
+  14 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.1.ebuild, +xkeyboard-config-2.4.1-r1.ebuild,
+  +files/xkeyboard-config-2.4.1-extended-function-keys.patch:
+  Add upstream patch to unbreak extended function keys, bug #386561.
+
+*xkeyboard-config-2.4.1 (04 Oct 2011)
+
+  04 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.ebuild, +xkeyboard-config-2.4.1.ebuild:
+  Version bump to fix bug #385673. Drop broken release.
+
+  03 Oct 2011; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-2.3.ebuild:
+  Marked ppc ppc64 stable for bug #380421.
+
+  02 Oct 2011; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.3.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #380421
+
+*xkeyboard-config-2.4 (02 Oct 2011)
+
+  02 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.4.ebuild:
+  Version bump.
+
+  21 Sep 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.3.ebuild:
+  Stable for HPPA (bug #380421).
+
+  05 Sep 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.3.ebuild:
+  arm stable, bug #380421
+
+  04 Sep 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.3.ebuild:
+  x86 stable, bug #380421
+
+  30 Aug 2011; Tony Vroon <chainsaw@gentoo.org> xkeyboard-config-2.3.ebuild:
+  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in bug
+  #380421 filed by Chí-Thanh Christopher Nguyễn.
+
+  30 Jul 2011; Matt Turner <mattst88@gentoo.org> xkeyboard-config-2.1.ebuild,
+  xkeyboard-config-2.2.1-r1.ebuild, xkeyboard-config-2.3.ebuild:
+  Update xkbcomp dependency to >=1.2.1. Bug 375547.
+
+  15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  ppc64 stable wrt #363965
+
+  28 Jun 2011; Brent Baude <ranger@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  Marking xkeyboard-config-2.2.1-r1 ppc for bug 363965
+
+  14 Jun 2011; Markus Duft <mduft@gentoo.org> xkeyboard-config-2.3.ebuild:
+  added ~x86-interix prefix keyword
+
+*xkeyboard-config-2.3 (06 Jun 2011)
+
+  06 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.3.ebuild:
+  Version bump.
+
+  15 May 2011; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #363965
+
+  13 May 2011; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  Stable for HPPA (bug #363965).
+
+  13 May 2011; Markus Meier <maekke@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  arm stable, bug #363965
+
+  09 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  x86 stable wrt bug #363965
+
+  28 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  Stable on amd64 wrt bug #363965
+
+*xkeyboard-config-2.2.1-r1 (20 Apr 2011)
+
+  20 Apr 2011; Michał Górny <mgorny@gentoo.org>
+  -xkeyboard-config-2.2.1.ebuild, +xkeyboard-config-2.2.1-r1.ebuild:
+  Migrate to XORG_CONFIGURE_OPTIONS array. This fixes bug #358637.
+
+*xkeyboard-config-2.2.1 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-2.2.ebuild, +xkeyboard-config-2.2.1.ebuild:
+  Version bump. Drop older.
+
+*xkeyboard-config-2.2 (04 Apr 2011)
+
+  04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.9.ebuild, -xkeyboard-config-2.0-r1.ebuild,
+  +xkeyboard-config-2.2.ebuild:
+  Version bump. Drop older.
+
+  18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.9.ebuild, xkeyboard-config-2.0-r1.ebuild:
+  Fix URI calculation in ALL ebuilds. Thx to Mr_bones.
+
+  17 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  Fix src_uri calculation.
+
+  05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  ppc64 stable wrt #354237
+
+  05 Mar 2011; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.1.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #354237
+
+  01 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild, xkeyboard-config-2.1.ebuild:
+  Fix building with new xorg-2 eclass
+
+  23 Feb 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.1.ebuild:
+  Stable for HPPA (bug #354237).
+
+  14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  ppc stable wrt #344827, #354237
+
+  13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.7.ebuild:
+  old
+
+  12 Feb 2011; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #344827
+
+  12 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  stable x86, bug 354237
+
+  12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  Stable on amd64 wrt bug #354237
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  OOps only testing keywords it should have :)
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  Sync with live version.
+
+*xkeyboard-config-2.1 (26 Jan 2011)
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xkeyboard-config-2.1.ebuild:
+  Version bump
+
+  31 Dec 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.0-r1.ebuild:
+  Stable for HPPA (bug #344827).
+
+  29 Dec 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.0-r1.ebuild:
+  arm stable, bug #344827
+
+  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  x86 stable, bug 344827
+
+  23 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  amd64 stable wrt #344827
+
+  19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  ppc64 stable wrt #344827
+
+*xkeyboard-config-2.0-r1 (01 Nov 2010)
+
+  01 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-2.0.ebuild, +xkeyboard-config-2.0-r1.ebuild:
+  Revision bump to fix bug #328455 c#26. Thanks to Oldrich Jedlicka for the
+  solution.
+
+  21 Oct 2010; Brent Baude <ranger@gentoo.org> ChangeLog:
+  Marking xkeyboard-config-1.9 ppc stable for bug 239063
+
+*xkeyboard-config-2.0 (28 Sep 2010)
+
+  28 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xkeyboard-config-2.0.ebuild:
+  Version bump.
+
+  28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  ppc64 stable wrt #327777
+
+  19 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  ia64/s390/sh/sparc stable wrt #327777
+
+  12 Sep 2010; Tobias Klausmann <klausman@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Stable on alpha, bug #327777
+
+  22 Jul 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.9.ebuild:
+  arm stable, bug #327777
+
+  14 Jul 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.9.ebuild:
+  Stable for HPPA (bug #327777).
+
+  13 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  x86 stable, bug 327777
+
+  12 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Stable on amd64 wrt bug #327777
+
+  11 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Migrate to xorg-2 eclass.
+
+*xkeyboard-config-1.9 (20 Jun 2010)
+
+  20 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xkeyboard-config-1.9.ebuild:
+  Version bump.
+
+  18 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  Bump to EAPI=3, add prefix keywords
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.5.ebuild, -xkeyboard-config-1.6.ebuild:
+  rm
+
+  19 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  s390 stable wrt #294958
+
+  18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  alpha/ia64/sh/sparc stable wrt #294958
+
+  14 Jan 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.7.ebuild:
+  arm stable, bug #294958
+
+  14 Jan 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.7.ebuild:
+  Stable for HPPA (bug #294958).
+
+  27 Dec 2009; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-1.7.ebuild:
+  Marked ppc stable for bug #294958.
+
+  15 Dec 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.7.ebuild:
+  Marking xkeyboard-config-1.7 ppc64 stable for bug 294958
+
+  10 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  x86 stable, bug 294958
+
+  10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  amd64 stable wrt #294958
+
+  03 Dec 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.6.ebuild:
+  Marking xkeyboard-config-1.6 ppc64 stable for bug 281427
+
+  21 Nov 2009; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  alpha/ia64/m68k/s390/sh/sparc stable
+
+  26 Oct 2009; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.6.ebuild:
+  Stable for HPPA (bug #282290).
+
+  11 Oct 2009; nixnut <nixnut@gentoo.org> xkeyboard-config-1.6.ebuild:
+  ppc stable #282290
+
+  09 Oct 2009; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.6.ebuild:
+  arm stable, bug #282290
+
+  08 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  Depend on intltool not gettext as required in configure. Per bug #287964.
+
+  08 Oct 2009; Olivier Crête <tester@gentoo.org> ChangeLog:
+  Stable on amd64, bug #281427
+
+  06 Oct 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.7.ebuild:
+  make the ebuild more EAPI=2-like
+
+*xkeyboard-config-1.7 (06 Oct 2009)
+
+  06 Oct 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.7.ebuild:
+  bump to 1.7, sync with x11 overlay
+
+  06 Oct 2009; Rémi Cardona <remi@gentoo.org> -xkeyboard-config-1.1.ebuild:
+  drop old ebuilds
+
+  05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  x86 stable, bug 282290
+
+  30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  amd64 stable wrt #282290
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.1.ebuild,
+  xkeyboard-config-1.5.ebuild, xkeyboard-config-1.6.ebuild:
+  add missing build-time gettext dep (fixes bug #221127)
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org>
+  -xkeyboard-config-0.8-r1.ebuild, -xkeyboard-config-0.9.ebuild,
+  -xkeyboard-config-1.2.ebuild, -xkeyboard-config-1.3.ebuild,
+  -xkeyboard-config-1.4.ebuild, -files/add_missing_lsgt.patch:
+  drop old ebuilds (will drop 1.1 later)
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.6.ebuild:
+  drop accidental stable alpha keyword on 1.6
+
+  23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Stable on alpha. It's needed for xorg-server-1.5/xorg-x11-7.4
+
+  23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  Stable on alpha for xorg-server-1.5/xorg-x11-7.4
+
+*xkeyboard-config-1.6 (13 Jun 2009)
+
+  13 Jun 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.6.ebuild:
+  bump to 1.6
+
+  15 May 2009; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  arm/m68k/s390 stable
+
+  16 Apr 2009; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.5.ebuild:
+  Stable for HPPA (bug #251832).
+
+  15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  ia64/sh stable wrt #251832
+
+  06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Stable on sparc, bug #251832
+
+  05 Apr 2009; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.5.ebuild:
+  x86 stable, bug #251832
+
+  05 Apr 2009; Olivier Crête <tester@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Stable on amd64, bug #251832
+
+  03 Apr 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.5.ebuild:
+  Marking xkeyboard-config-1.5 ppc64 stable for bug 251832
+
+  03 Apr 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.5.ebuild:
+  Marking xkeyboard-config-1.5 ppc stable for bug 251832
+
+  31 Mar 2009; Justin Bronder <jsbronder@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Update license, #263535
+
+*xkeyboard-config-1.5 (28 Jan 2009)
+
+  28 Jan 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.5.ebuild:
+  bump to 1.5
+
+  23 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild, xkeyboard-config-0.9.ebuild,
+  xkeyboard-config-1.1.ebuild, xkeyboard-config-1.2.ebuild,
+  xkeyboard-config-1.3.ebuild, xkeyboard-config-1.4.ebuild:
+  add missing dep on dev-util/intltool (fixes bug #243226)
+
+  16 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xkeyboard-config-1.4.ebuild:
+  Move x11-apps/xkbcomp to DEPEND from RDEPEND. This helps prepare for
+  possible use of XKB files on the console in addition to within X by
+  removing runtime X-related dependencies. The console-setup package in
+  other distros contains tools for handling this called ckb (ckbcomp, etc.).
+  I'd like to look into using this in Gentoo instead of sys-apps/kbd.
+
+*xkeyboard-config-1.4 (14 Oct 2008)
+
+  14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.4.ebuild:
+  Version bump.
+
+*xkeyboard-config-1.3 (10 Jun 2008)
+
+  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.3.ebuild:
+  Bump. Around 40 bugs from freedesktop.org bugzilla were fixed. Dropped old
+  rulesets sgi and sun. Added a lot of metadata, related to countries and
+  languages.
+
+  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  xkeyboard-config-1.2.ebuild:
+  Revert stable keyword for amd64 because of Comment #1 in bug 213933.
+
+  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  xkeyboard-config-1.1.ebuild, xkeyboard-config-1.2.ebuild:
+  amd64 stable
+
+  05 Feb 2008; Markus Rothe <corsair@gentoo.org>
+  xkeyboard-config-1.1.ebuild:
+  Stable on ppc64
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xkeyboard-config-0.8.ebuild:
+  Clean up.
+
+*xkeyboard-config-1.2 (30 Jan 2008)
+
+  30 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.2.ebuild:
+  Bump.
+
+  27 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.1.ebuild:
+  alpha/ia64/sparc stable
+
+  19 Dec 2007; Dawid Węgliński <cla@gentoo.org>
+  xkeyboard-config-1.1.ebuild:
+  Stable on x86 (bug #202087)
+
+  02 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xkeyboard-config-0.9.ebuild:
+  Stable on amd64/x86 wrt bug #191615.
+
+  29 Sep 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.9.ebuild:
+  sparc stable wrt #191615
+
+  28 Sep 2007; Joshua Kinard <kumba@gentoo.org> xkeyboard-config-0.9.ebuild:
+  Stable on mips, per #191615.
+
+  26 Sep 2007; Samuli Suominen <drac@gentoo.org>
+  files/digest-xkeyboard-config-1.1, Manifest:
+  Fix digest wrt #193868.
+
+  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xkeyboard-config-1.1.ebuild:
+  Use emake on install. Stop adding /usr/share/X11/xkb to CONFIG_PROTECT
+  because of popular demand. If users require protection for this directory,
+  they must create their own file in /etc/env.d/ to do it.
+
+*xkeyboard-config-1.1 (26 Sep 2007)
+
+  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.1.ebuild:
+  Bugfixes, some new layouts.
+
+  10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-0.9.ebuild:
+  Stable for HPPA (bug #191615).
+
+  09 Sep 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.9.ebuild:
+  alpha/ia64 stable wrt #191615
+
+  08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-0.9.ebuild:
+  Marked ppc/ppc64 stable for bug #191615.
+
+  07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on sparc wrt #175465
+
+  03 Jul 2007; Lars Weiler <pylon@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on ppc; bug #175465.
+
+  02 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  alpha stable wrt #175465
+
+  24 Jun 2007; Joshua Kinard <kumba@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on mips, per #175465.
+
+  20 May 2007; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable for HPPA (bug #175465).
+
+  05 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Marked stable on amd64 for bug #175465
+
+  29 Apr 2007; Andrej Kacian <ticho@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on x86, bug #175465.
+
+  25 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  0.8-r1 ebuild was broken, fixing and stabilizing on ppc64 and ia64
+
+  25 Apr 2007; Markus Rothe <corsair@gentoo.org> ChangeLog:
+  Stable on ppc64; bug #175465
+
+*xkeyboard-config-0.9 (14 Nov 2006)
+
+  14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkeyboard-config-0.9.ebuild:
+  Version bump.  Thanks to Camille Huot for the poke (bug #155124).
+
+*xkeyboard-config-0.8-r1 (03 Sep 2006)
+
+  03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/add_missing_lsgt.patch, +xkeyboard-config-0.8-r1.ebuild:
+  Add missing LSGT symbol to evdev symbols.  (Dennis Schridde, Bug #145097)
+  This should fix the availability of <, > and | for users of this symbol list.
+
+  16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
+  Keywording ppc64 stable per MrBones request
+
+  16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
+  Marking ~ppc64 per MrBones request
+
+  19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xkeyboard-config-0.8.ebuild:
+  Stable on hppa.
+
+  10 Jul 2006; Aron Griffis <agriffis@gentoo.org>
+  xkeyboard-config-0.8.ebuild:
+  Mark 0.8 stable on ia64
+
+  04 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  Some old XKB thing (xkbdata?) installed /usr/share/X11/xkb/symbols/pc as a
+  directory. Now we install it as a file, but portage won't let a file replace
+  a directory so it doesn't get installed. This breaks XKB setups, with
+  numerous reports. Check for the directory in pkg_setup().
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  ppc/sparc/mips/alpha/arm/sh stable
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/0.7-fix-scroll-lock.patch, -xkeyboard-config-0.7-r2.ebuild:
+  Pull old version.
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xkeyboard-config-0.8.ebuild:
+  Stable on amd64.
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  x86 stable.
+
+  21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  (#130590) Ensure that the old XKB directory gets out of the way (Patrick
+  Allaert).
+
+*xkeyboard-config-0.8 (16 Apr 2006)
+
+  16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkeyboard-config-0.8.ebuild:
+  Bump.
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xkeyboard-config-0.7-r2.ebuild:
+  Add ~x86-fbsd keyword.
+
+*xkeyboard-config-0.7-r2 (23 Mar 2006)
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.7-fix-scroll-lock.patch, -xkeyboard-config-0.7-r1.ebuild,
+  +xkeyboard-config-0.7-r2.ebuild:
+  (#124657) Fix scroll lock randomly turning on and off.
+
+  09 Mar 2006; Aron Griffis <agriffis@gentoo.org>
+  xkeyboard-config-0.7-r1.ebuild:
+  Mark 0.7-r1 ~ia64
+
+  23 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7-r1.ebuild:
+  dev-perl/XML-Parser is DEPEND, not RDEPEND.
+
+  21 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7-r1.ebuild:
+  Let xkbcomp take care of creating /var/lib/xkb, as suggested in fd.o bug #5906.
+
+*xkeyboard-config-0.7-r1 (13 Feb 2006)
+
+  13 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -xkeyboard-config-0.7.ebuild, +xkeyboard-config-0.7-r1.ebuild:
+  (#122214) Create /var/lib/xkb so xorg-server doesn't fail later when trying
+  to write to /usr/share/X11/xkb/compiled.
+
+  07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7.ebuild:
+  (#122010) Fix deps, thanks to Caio <errado@gmail.com>.
+
+  07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7.ebuild:
+  Also make the xorg rules symlink.
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7.ebuild:
+  Meaningless whitespace change to re-commit and fix manifest.
+
+*xkeyboard-config-0.7 (06 Feb 2006)
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml,
+  +xkeyboard-config-0.7.ebuild:
+  New, restructured, maintained package for XKB configuration data, expected
+  to supercede xkbdata. Since it's the same collection of data files,
+  keyworded ~arch for the same arches.
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
new file mode 100644
index 0000000..30cdee1
--- /dev/null
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -0,0 +1,10 @@
+AUX xkeyboard-config-2.10.1-r1_svoraka5.patch 3121 SHA256 fcd0cc953e2a2d019a7a9db2bbf183a7ae8652bd4b3b1532723fad035dbccbef SHA512 21e9564666d83540428cd7aaf3a4c0842a1441aee07441cab94af286a0af509aaa6e2fdd30a241a617cb0409cb8fa7d132016a65e6a7074a5e44266238bb13f3 WHIRLPOOL 00c9d38834fb046a9718a33c07d033efb936f61088aa16afeb83245ccd0495818c76d49a73635975dcdc617357b161c9da08261dab90d97ba6a9733189681ceb
+AUX xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch 539 SHA256 899b1a8fc9621371c9800df5995da7b9a46240ff7b2f59b8f27459ad264a8e94 SHA512 becf88f5f9702aded597dc2ea965f44b3cd0a0501494f0c44f751746d7837370673cbac08b2562d83b56754703ae42d0538d376ab14a03edf330fe67877a71c3 WHIRLPOOL deaed40aa359488369c8706c2f7186f3b992e0ba93ae64e02b95c7ae066d3b5bd3cd98d839b743921234f2918d7466f140de2f18680e20f8859ab1f60f150d67
+DIST xkeyboard-config-2.10.1.tar.bz2 908897 SHA256 7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b SHA512 e21927e365f4742d710bf414c312a9bcaf46d881ee274f1baa0a288339477fa8aa24c338473f96ec658133205f21db43d1737d6c59c77999344244c43cff1be2 WHIRLPOOL 6a9b48b57b70245c9d1db1695e380848268a8125c735324c178faf88086f2827192997db7dfb2b2824c71ee771d93355d5efcfe2a4dba39f902ea784455e00bf
+EBUILD xkeyboard-config-2.10.1-r1.ebuild 1465 SHA256 c53a2456f740356a2390f349cc5a63b2cb203c6aa0e8191a2184a382c873899c SHA512 3824493156a10c086b8795f9591b88f62988ba06a22910afda67594bf6f37827ec20acaa5ce132d2cdf909ce5c2a3b064951ad2921c370c2c3810b8b18b465a5 WHIRLPOOL 4abf6c71c0f79cfd611652b46bfc5bab063bb73c27213e84d0a7cf98a8dee75246bedc4370a33a4ce323f43b44e15467f4d0c907f4f06498b03e047c8d9229a9
+MISC ChangeLog 27288 SHA256 d0f3f73e5097c159508cf1334a4f3e287bccebc10697b9c24003fe9899f89ae9 SHA512 7046dd37df969ddf4dd119b347e7deeb4788385728ee4515d507d9f1e5ba33d3f4076366f1f6b67dd0551e67f20c4f78f6b521d9a7c306a3a03799d7bc943923 WHIRLPOOL 7d4cac01897302ca69cecccde001471a8267af04c3e56215042bc211ad6e55a621e8637ea38a00e3560d407db19a77cd2532137bb9bea3cb127e97c80db14871
+MISC base.xml 199658 SHA256 6907bb492a52b4fa52601806b2dcc819129efb97cd18eec0ca2d4feac99e1eb1 SHA512 aece1919864f97662c04a9d662a2098fe9cb23e3cdf7739e54cebc54f7064e6d915243f31a38a2b55a759821d0ad00ecfc28776a51619dcd9139913085335ee3 WHIRLPOOL 3ac231525900650a59a12256d1f89378c40c2235d2f6a44551ff9773af4291412bbb4702fa6791e23ae61ca4dd3d1dd83e4ea43a2fa9ec24aa10d8cd05a2d537
+MISC base.xml.in_new 213236 SHA256 e619ce2e6f6d7c485b424c4f8e9b0eba096eba45f25ed433c1ee08cbbcf34ff7 SHA512 15415b7b652cb981b0e8e208879b808a09904f55254035286e7638bb501b9ecd3c6d9f2d21141ba4e88470692d222b980df119db61ac058d657b9429b88cad1c WHIRLPOOL a2089dc28cd8c9700b2c2f26ba92a9ed207192c7a0f6722378f2f220caf5c1d922f833923bc14790d5ac408172599335168f83635c9a830ec0512c8820c44dcf
+MISC base_new.lst 41557 SHA256 d2cb7149f82747206527cbb11879753317efcdafd24fe6fe16388f314bb6a735 SHA512 225e17dd1c2e799e262425395674c26eccc07ff253203ce6b894b2ba04c3c51b1c88fdfef8d4a6ac100dc503af479eb6d755aa7941f752dbf78189e581ff37da WHIRLPOOL 6c2bef85436c56577561cf0ece27aa50dea82b982ee4a4fd7de2292d590ee711f0b94f93818652586ee924e56e4bb23b43dd15b8449342c517b48a66b4d6bd3a
+MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
+MISC se_new 15437 SHA256 8fa533a65e6fa8c67b09918264bb9e3f04e831ebc5ec47e0fa21a5a5746bfbd4 SHA512 218b861b6267d05c55f9332ae898d8da4a15d865afed6c4c6b1a7a0efa2e4bf6bd9d2d1e1fff3bd32347e1130084844bf577a91c63076fbb04d538c816f8852d WHIRLPOOL aeede6558e417f022553f955ed85ae06a0162f32b52ebde9b78018a24bbfed81c6c66b1341a73757c709e554e0993b99e7886bfbbf509f7eb7f280aabf5df6c0
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5.patch
new file mode 100644
index 0000000..7517e06
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5.patch
@@ -0,0 +1,56 @@
+--- symbols/se		2013-10-02 20:06:27.000000000 +0200
++++ symbols/se_new	2013-10-26 18:21:21.681861912 +0200
+@@ -89,6 +89,53 @@
+     key <AB10> { [         z,          Z, guillemotleft,        less ]	};
+ };
+ 
++partial alphanumeric_keys
++xkb_symbols "svorak_a5" {
++
++	name[Group1]="Swedish (Dvorak A5)";
++
++	include "se(basic)"
++
++	key <LWIN> { [ Super_L                                           ] };
++	key <RWIN> { [ Super_R                                           ] };
++	key <AD01> { [ aring,      Aring,      braceleft,           none ] };
++	key <AD02> { [ adiaeresis, Adiaeresis, braceright,          none ] };
++	key <AD03> { [ odiaeresis, Odiaeresis, bracketleft,         none ] };
++	key <AD04> { [ p,          P,          bracketright,        none ] };
++	key <AD05> { [ y,          Y,          dollar,              none ] };
++	key <AD06> { [ f,          F,          quotedbl,            none ] };
++	key <AD07> { [ g,          G,          question,            none ] };
++	key <AD08> { [ c,          C,          ampersand,           none ] };
++	key <AD09> { [ r,          R,          less,                none ] };
++	key <AD10> { [ l,          L,          greater,             none ] };
++	key <AD11> { [ comma,      semicolon,  dead_cedilla,        none ] };
++	key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde,	asciicircum	]	};
++	key <AE12> { [ dead_acute, dead_grave, plusminus,           none ] };
++	key <AC01> { [ a,          A,          semicolon,           none ] };
++	key <AC02> { [ o,          O,          slash,               none ] };
++	key <AC03> { [ e,          E,          parenleft,           none ] };
++	key <AC04> { [ u,          U,          parenright,          none ] };
++	key <AC05> { [ i,          I,          bar,                 none ] };
++	key <AC06> { [ d,          D,          numbersign,          none ] };
++	key <AC07> { [ h,          H,          asciicircum,         none ] };
++	key <AC08> { [ t,          T,          numbersign,          none ] };
++	key <AC09> { [ n,          N,          quotedbl,            none ] };
++	key <AC10> { [ s,          S,          asciitilde,          none ] };
++	key <AC11> { [ minus,      underscore, grave,               none ] };
++	key <BKSL> { [ apostrophe, asterisk,   asterisk,            none ] };
++	key <AB01> { [ period,     colon,      colon,               none ] };
++	key <AB02> { [ q,          Q,          equal,               none ] };
++	key <AB03> { [ j,          J,          at,                  none ] };
++	key <AB04> { [ k,          K,          exclam,              none ] };
++	key <AB05> { [ x,          X,          backslash,           none ] };
++	key <AB06> { [ b,          B,          percent,             none ] };
++	key <AB07> { [ m,          M,          grave,               none ] };
++	key <AB08> { [ w,          W,          lstroke,             none ] };
++	key <AB09> { [ v,          V,          leftdoublequotemark, none ] };
++	key <AB10> { [ z,          Z,          guillemotleft,       none ] };
++};
++
++
+ // Ivan Popov, 2005-07-17
+ // phonetic layout for Russian cyrillic letters
+ // on Swedish (latin type2) keyboards
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch
new file mode 100644
index 0000000..5921c12
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.10.1-r1_svoraka5_basexml.patch
@@ -0,0 +1,15 @@
+--- rules/base.xml.in		2013-08-26 00:29:54.000000000 +0200
++++ rules/base.xml.in_new	2013-10-26 18:44:49.130801519 +0200
+@@ -4561,6 +4561,12 @@
+         </variant>
+         <variant>
+           <configItem>
++            <name>dvorak_a5</name>
++            <_description>Swedish (Dvorak A5)</_description>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
+             <name>rus</name>
+             <!-- Keyboard indicator for Russian layouts -->
+             <_shortDescription>ru</_shortDescription>
diff --git a/media-libs/freeimage/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index d3c2cc9..01c4c00 100644
--- a/media-libs/freeimage/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<herd>x11</herd>
 </pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild
new file mode 100644
index 0000000..7301212
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.10.1.ebuild,v 1.1 2013/10/04 10:12:14 chithanh Exp $
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2 eutils
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=x11-apps/xkbcomp-1.2.3
+	>=x11-libs/libX11-1.4.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	>=x11-proto/xproto-7.0.20"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-r1_svoraka5_basexml.patch"
+	epatch "${FILESDIR}/${P}-r1_svoraka5.patch"
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}
+
+src_compile() {
+	# cleanup to make sure .dir files are regenerated
+	# bug #328455 c#26
+	xorg-2_src_compile clean
+	xorg-2_src_compile
+}
author	Peter Asplund <peter.azp@gmail.com>	2013-10-26 18:55:31 +0200
committer	Peter Asplund <peter.azp@gmail.com>	2013-10-26 18:55:31 +0200
commit	2366049d5f13c14afe419bbe36a4c9310749c0c7 (patch)
tree	ad86deb0d68da42c9122e51a57d51d7e0925efd4
parent	Rename ebuild to -r1 and recreate Manifest. (diff)
download	AzP-2366049d5f13c14afe419bbe36a4c9310749c0c7.tar.gz AzP-2366049d5f13c14afe419bbe36a4c9310749c0c7.tar.bz2 AzP-2366049d5f13c14afe419bbe36a4c9310749c0c7.zip