Bump and tidy old versions

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64

4 files changed, 21 insertions, 49 deletions

diff --git a/dev-libs/libcec/ChangeLog b/dev-libs/libcec/ChangeLog
index 6cf176f24e4f..fe5fac1cb2ba 100644
--- a/dev-libs/libcec/ChangeLog
+++ b/dev-libs/libcec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libcec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/ChangeLog,v 1.23 2013/02/15 16:59:15 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/ChangeLog,v 1.24 2013/03/17 19:36:34 thev00d00 Exp $
+
+*libcec-2.1.1 (17 Mar 2013)
+
+  17 Mar 2013; Ian Whyman <thev00d00@gentoo.org> +libcec-2.1.1.ebuild,
+  -libcec-1.6.2.ebuild, -libcec-1.8.1-r1.ebuild:
+  Bump and tidy old versions
 
 *libcec-2.0.5-r1 (15 Feb 2013)
 
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index c9b6cf7227d1..8c65b51e4263 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,12 +1,10 @@
 AUX libcec-1.8.1-eintr-retry.patch 1136 SHA256 90c74e3c7ac69b3dd7283c41812d926727e6db2e53359020b5f77efd2f3c77aa SHA512 91bde0b869beb18b43c0431438345b16a41051a9774d575c15e2a0acf2a6257103febefa960f4aa107c03f90aa804948a1ca37aabc1c2a5791c3ef53add5596d WHIRLPOOL 6fd8cc3fcd3509906323567e040614c972eefd9dc87c0a8f10f35b672d20f061a31ac80afc7afd8dd94024441094ebb3b324410c43c53d9b09ce4e0ef09be1a5
-DIST libcec-1.6.2.tar.gz 929364 SHA256 2d853df4478a9b93ef699c7038cf78a97741b1a594996d1df644f2d5e51d6969 SHA512 6b42c6810ebc6819e1cf1c806a25d8ca5ccc6786d4026a595e7b86336f7cb087d80e9daf464f3bbccb2fa3d009f551fdcb616d5b5ddea2d8db42b28499786dcd WHIRLPOOL 2d78ab7885a04975b7c283041a33747a09b7444bedba27f2cd3057558f255ce3a8c60766766664685c79cf4fd19b35cf7f13281c8eace605891c2948a0a1a9ce
-DIST libcec-1.8.1.tar.gz 986052 SHA256 97cda7935404360b56e3c0698deabcc97548bc357a4e4fecbe89de3db12ca0bc SHA512 e8224f1287f5486641b495f84df528d85e793d9a60b547ee6516d7607314b48d2fc10968df42cfd3f35db0b2173ac811d4fd23e3ba2c23c9180b6842b30b8bb3 WHIRLPOOL 97af989c01206a71ff1cfbf615df675a67d563641f6c5a716cf1abbeea79e92c8a840f5a2de0ac4d1d04933f83592b36938601bbe4cdc492a99c18496d754075
 DIST libcec-1.9.0.tar.gz 988708 SHA256 93c0c56b446f82ef71499fd88186c7212a92b037cb8a19516140216cc0aae68f SHA512 aba909b63b18ce7aa4f3accdd083eca28222f8aa74d0c43de55ee042db980e6bb00c342f475f7e903b2d86d5fdee78d08641c983cf5b0f19574483a9c0876903 WHIRLPOOL abf5f6f858b1c3d7599940de52ae95349577fd7ab6ae2e4f3164e2139b1799cc44a6b5f563efdbdd8512d4b8f8db3d02cabccdb9f8512b18c14e1ad00a8662f9
 DIST libcec-2.0.5.tar.gz 1077230 SHA256 83d99cf759531d8c8a217f360f4748159cb9cedac98d77a4615450bad6d570c4 SHA512 1584476367063d106b823f57fc12fa7f6502a1396445844575f6b2509e983cd42a2f280e3c577de0601f839cca88bd29adc9a62f23164d82e5bf1d2bc3c53124 WHIRLPOOL 5923538f61cb445aea5545fb373176140229487595ca4bdb02575d335c6c505c9cae3d698a13d69b9ffcc7d0f131fac4e63b128041f2ce64ede3f45c06095874
-EBUILD libcec-1.6.2.ebuild 851 SHA256 4519483e5ac723bc6db8d03668788c2b48f884fb5cbf86ffffbfda0b6bcebaaf SHA512 fa0d2617d40512a97d992693b377fcc7854709cd3323720c0d0a155dd858362dc783df3663d2ac2dadaa7558bf52a12280b24f62c99d8f34ce57e053f0eb73c0 WHIRLPOOL f33eba58bac846e9e14b3b14309f809c030bf92217c4677a458570fc3e33214b78bb3f17c9547ace1342d7b53e8765c2ddb05013d28cb9acaa403e3c6f3c1567
-EBUILD libcec-1.8.1-r1.ebuild 922 SHA256 eb0364999c30d591cdcab6fb4838fe320bd5cf6306d54567c0b235546f729e5e SHA512 64450ddd9eff67c410ca4ad29f638bd49e85fe77d6eaa50a0bcef6b3846a81959bc25f190677b236bafae3290aa7523891611b671274c6d8463dbd945db86e98 WHIRLPOOL bb971a8494aa782445996bc6d19fd6ea971527b61b44f9b2e4bef51027cef29aa0fa0833bd53cb286a743c8d5df85e2d6872484f54e896c26691af01a84faf9a
+DIST libcec-2.1.1.tar.gz 1081702 SHA256 085cabf38bbe82c0a1c78fc4a0cc318b3c4f5fadae325b3d648821d2a4bf694d SHA512 beb1e39348aa54ac64bb1508de82a12eb0f4bf6388dde341c24354b23e51eb851c62cb76523718a2cbd5048e4fa147cdf422cb39be59c0c403cfdf7f91162cf3 WHIRLPOOL 4fee1fea75102ce85c0af65f4945166b214526003084d273ec8020d1c88cb3298635a970a814df84f4d37f423497e9765d60dfe62557d0c09b64c8ebcc523c4c
 EBUILD libcec-1.9.0.ebuild 876 SHA256 a849eebaf9c3bc2af784540d7bfd589d2160e1a7cc98980cbe5af7a02d532cde SHA512 6b570ccd346521d7e0a3d74adfbfe88ccbf461d6a349879857af11d4a438aece4700a493a9c14e7641c2028de5c3d865bbe69efe8bb7e25a17b90568d9717f10 WHIRLPOOL 47cf3f3dfc00b40050ec5a4734a467b4e0212c288c144ac572305f887f2ec9dd813d438d4278ee59744caf34b707413fe518b6d67ba89983613276133a057b4b
 EBUILD libcec-2.0.5-r1.ebuild 1022 SHA256 b7aaffde66443218b6b2286d6003918e041824ee33ea1d63bbb784f480e13e68 SHA512 c8089df39da5f9ecdfd8361313739bbd37b0a2af1919b26968d270fb13cfeb4f163c0c0b516e4094e45480f5bbea7c981a24cc4b1674276bff778fd0964a6a27 WHIRLPOOL 6323ce51b231a728d64f3e84e047e489e64e3f78dc1481d09090f105924a337939ef380c6d7f031ce39b2c267fa0c70daa632e6d76c0b5333cac0d21089da606
 EBUILD libcec-2.0.5.ebuild 958 SHA256 7d12561a95c87d2327933e95a2ab713116b7e89032477759beabe4a5bc3d0870 SHA512 8833e0f5f313f07a14f1c7c5df6b60bde2b71889203d7fb882d4b4144852ed3f647625cd285a099bd6853714ef398bab2978963ad955542535e6c27b6d840bb0 WHIRLPOOL 1a0048657ab8ac62c5cb7eb2f4aa9f873e88ee7d9e5cc82f113cb8d94473b73e19691298c9c24b5a87211bcbc8767be7a6945ed708585af66464e315a647ebc4
-MISC ChangeLog 3276 SHA256 f32e7ab36fc4ae01e3b5ba1ccafe4952bfa6755883372fad2193c62878c03237 SHA512 3e0d0c3ae26231c068ae235a52b68456c811eba8c3d9d76d0088b23a6937ed019fba6bba74a0f6df212608b815560d166540950110ea6e883de249a3808baea1 WHIRLPOOL 738ad638e41c39a5a6fed4f5ca2a86377bffa42b6f162cd8e735fcdee0a26b51b0766b281fb566871d3213c87739ff45126b2e23a5376a3f5e33e0c98c2968b6
+EBUILD libcec-2.1.1.ebuild 1019 SHA256 3b8f26498586c52ca22d59cbb7018466bdd5a59a72e001cfbd0feccac56edb62 SHA512 54bc843b401fa41e5debd77c7628864cb63eb5d46e9962ee4e271129283c54bec4ceefd1166c0108d362983a03f7095907e15c0ae77284f9ece16c019ebd0177 WHIRLPOOL 35f5db6d60623d7c90d93af62bb142c9d6c1a96bdf3d394411ff7774d7d6e3896acfc7ebfe61e95b09df3f299bd71c4c0bb6c6032ab4db0c619cb13a5663d36f
+MISC ChangeLog 3455 SHA256 66a34285d0b220154cfb075f1bb88b69f7dc4f7915065762727e1f84dd01566d SHA512 71d8dd4ec795f8e9fbfe933bce113d9d51aac19c1fe06b6046d221a306ae33a59723fe43fdd13bf655066509ced911da91544730f52bd1142a2f363b6253c919 WHIRLPOOL 9e26808a6a29cf58274c56ef4abe54ee96c0ee12540fb874be4e74776e14b94810fe702afc80cab36fb0cae0bc3eb07d2bf304d53a5faceef6d808de35f70538
 MISC metadata.xml 232 SHA256 3e0886d31df5e2b8735dfa995ed12280c69f959a90a4e9d54bafd527110282a3 SHA512 ffd6f191fa1e2510e4c12c4b6c0b2240f188577b38b6b4ca297be5dd4424b352b24b6ff5ceccd06c0b2fcf55b2a372980bf8b980e2915334ba820ebdcdc149d8 WHIRLPOOL 47858cf96e435c48f17bc5abc285679acfcc01927852d6809a02c7610b16b81b145f23673070e1f3ae7354dd3876f882f6f00e2ba7320f50150b5c13f140e75b
diff --git a/dev-libs/libcec/libcec-1.6.2.ebuild b/dev-libs/libcec/libcec-1.6.2.ebuild
deleted file mode 100644
index c50e193674fc..000000000000
--- a/dev-libs/libcec/libcec-1.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/libcec-1.6.2.ebuild,v 1.4 2012/12/03 09:49:01 ssuominen Exp $
-
-EAPI="4"
-
-inherit autotools linux-info vcs-snapshot
-
-DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
-HOMEPAGE="http://libcec.pulse-eight.com"
-SRC_URI="http://github.com/Pulse-Eight/${PN}/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~USB_ACM"
-
-src_prepare() {
-	sed -i '/^CXXFLAGS/s:-fPIC::' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/libcec/libcec-1.8.1-r1.ebuild b/dev-libs/libcec/libcec-2.1.1.ebuild
index 2ae08477aff2..4bfc9d77a5fd 100644
--- a/dev-libs/libcec/libcec-1.8.1-r1.ebuild
+++ b/dev-libs/libcec/libcec-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/libcec-1.8.1-r1.ebuild,v 1.4 2012/12/03 09:49:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcec/libcec-2.1.1.ebuild,v 1.1 2013/03/17 19:36:34 thev00d00 Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools eutils linux-info vcs-snapshot
 
@@ -12,8 +12,8 @@ SRC_URI="http://github.com/Pulse-Eight/${PN}/tarball/${P} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
 
 RDEPEND="virtual/udev"
 DEPEND="${RDEPEND}
@@ -24,12 +24,16 @@ CONFIG_CHECK="~USB_ACM"
 
 src_prepare() {
 	sed -i '/^CXXFLAGS/s:-fPIC::' configure.ac || die
-	epatch "${FILESDIR}/${P}-eintr-retry.patch"
+	sed -i '/^CXXFLAGS/s:-Werror::' configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf $(use_enable static-libs static) \
+	$(use_enable debug) \
+	--enable-optimisation \
+	--disable-rpi \
+	--disable-cubox
 }
 
 src_install() {