Version bump, drop old

Package-Manager: portage-2.2.0_alpha149-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

5 files changed, 16 insertions, 182 deletions

diff --git a/dev-libs/eina/ChangeLog b/dev-libs/eina/ChangeLog
index e519e61ff300..d5499f33c954 100644
--- a/dev-libs/eina/ChangeLog
+++ b/dev-libs/eina/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/eina
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/ChangeLog,v 1.15 2012/12/08 14:01:55 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/ChangeLog,v 1.16 2012/12/21 19:27:50 tommy Exp $
+
+*eina-1.7.4 (21 Dec 2012)
+
+  21 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> -eina-1.7.1.ebuild,
+  -eina-1.7.3.ebuild, +eina-1.7.4.ebuild, -files/city.h:
+  Version bump, drop old
 
 *eina-1.7.3 (08 Dec 2012)
 
diff --git a/dev-libs/eina/Manifest b/dev-libs/eina/Manifest
index f3685d3462f8..f17838b997ce 100644
--- a/dev-libs/eina/Manifest
+++ b/dev-libs/eina/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX city.h 3746 SHA256 0048205504c2f569f37ad2abc97f8f379dad69015c6f82401f88649efc2a8c43 SHA512 81628a9597d6e133862ef0717829213a5f79506167242549f2e4eda54be6b2fc586853eaf692ae63bad4cbf40cfa56d3d8ba74bc22aea4152bfee95b8fb6c9e2 WHIRLPOOL 120d1c339564259524e935a42e8f76fce00f9e86e2a0493fd54d88bea35b6437107fc1982e2600c00c6eec0e1c23ca812f228db9a23ac4cde01c037c3bd62b92
-DIST eina-1.7.1.tar.bz2 9749033 SHA256 af0b316734ba72d92fa7716005efd380f28677c76f0e0b6a3c5a9b524575a6ce SHA512 b0aafd2d278851b94384b81398b93f458965e9dc0c1ff344dd4c1a7ebf0d17bfa1551292e0172e367b9f781d3f71bf5086485885f3948a0799192a7e4cb82d67 WHIRLPOOL 599f29e5c16976ec60ea6f672922e9c2c52f6636f32cfad575ffe1db1cc62adb75f9e681a83fd2bdc8b49ee249246d5d8927a9e0ad9ac909b991d031d7ffc047
-DIST eina-1.7.3.tar.bz2 9805893 SHA256 638b57c4ff44ce2ce00b5be395d87deadc3810c5079ea4de608630363d6b54d7 SHA512 6a3c5ae63163fe1362b12133a4a68116c2a3081ff4b3847a52de10f4adc9c101647a2097976a1e3556287ade9045c4d6f374f599706d2f384b02a0f3425468cb WHIRLPOOL ddef4f32fa9771470c0cd95124b99039b1a9d95fdc8f41f7ccbcddf8dbc11a31a95983b5095e2ef4853365540fefae8de2131d4a0fe643b7a93b244ef8231255
-EBUILD eina-1.7.1.ebuild 1854 SHA256 a283414c52109e5780d0fae180855177c22fe17f4c1abd34de559b6533c01b43 SHA512 bbe575c6b52f5c88b28a26b04d86055a1ce41506f20733390c143527cdbd39176ed09ca70f085039f96ec96ce429ea05910b8c4fb665ca4b6b96a25e186d8527 WHIRLPOOL c84333972090dbcc2567feb21326c38db8fdd00937dcdf162d970b8a41b86beb95a99a4acb33ddb07ed4a3112e280a78bb98370be98125de53b27b6d9e3a2742
-EBUILD eina-1.7.3.ebuild 1854 SHA256 484963bcc8015492b7e96f720f6322a88fc60a39700b203fb43f4f90fe4df3a5 SHA512 cc067aa3a93102da04e881e540af562f999e1924f92922004d271ecc2dc2a16b36874b3eac8044b2bfb4924614e35041a667d85e81b1e1dae0f8d775d206f3d2 WHIRLPOOL ae6f0b473438c8c9828cfe102c732115a7ec81eaf7a1172c0d908eda1719772d60950137f032e82d3e69cfdfef9006b97d13d3c8e7a36631cf34710474a6d516
-MISC ChangeLog 2338 SHA256 652c279b887b2d02d0c1b056bbb19669de5c2d0bbb3df8bdd61883e1fa37fc57 SHA512 bcd77e2e1587b0300152fa126f91af220452fa95d0fdcd0eb94f72ea50a5dcdc9261c1b4d284fb34081b3b3aa41270adfb8e556a041a6c0a9fe8f3af9f4f918d WHIRLPOOL a94bdf9a04961f987b45477d92c7872f72a2242e32858117e17628bd912692ba420fc5eaa3d71b44b28935995f9cdc35c5f654f29e92ace60d4f8e745ced30db
+DIST eina-1.7.4.tar.bz2 9806158 SHA256 f16da871eabb9e2b34f1fa7d110a9040e07c458bc27ebc7b6b60f43801a78e54 SHA512 8bcc2a961050da9bffbb93483f653a7f633ce3f11b55b35084075f6482d9a95f8c8ed48204b8b6a75c0780fc7abac1c7fe028c1e5a37662b927392bbc5318d7c WHIRLPOOL 8f32707577cf1d14af9a2298966c911aa84dac00ee81876e540ce56cdea7e780ab19f1927b662392671ecaea8ce35cd1759c90945a013cba0e10e87ef3c0174f
+EBUILD eina-1.7.4.ebuild 1764 SHA256 f9cd12b5da1eac4253b6e0e75b6927a91391a917d865e90a351dd7cd390ead35 SHA512 4ea643ee34c7d6920cbeb33f420253bde2ef0bf9a11607e2e31dd666b7766d7b20017caff27e76fa284cb7dd8a289eedf7f356fedbbf7eac88104542f384e7c7 WHIRLPOOL 5739d597806ad4abb07403d95993e9e42ab4695a7290d303a5096a7de46f2f4de1e5c28e565d182c5a8aefc7c6cdeb152156102c2fc75243a3ad349543ee824a
+MISC ChangeLog 2527 SHA256 744eab571be16abd6d533e272e6f1bf828ce4a42b27eaf201cd8f9571a793e18 SHA512 f07898b077236adef229d7430487d3429497d7743be3a214d2bacb9139616196f192ce2dfd316142a9d4e021602217a8daa1ba64db5f2523e6fa9198eca7b64a WHIRLPOOL 484a848ea111b43f60f56a8ebd5867630b8a05d0ad58eb96e73ffe475628f51ee8a1740a010e073256436fb42b233db59954a2f405e50bfb5d67e266b53b8655
 MISC metadata.xml 2145 SHA256 78cf232ee2e09f7185f8f06b37585e7222ebfcc9e9050560ecbca7f07d5a5df7 SHA512 582b753ec4cbf72646a056b6affbb28aea1a38af7a8c846372ca3b7e7985d48405847bb6cfe7232cfe7e3c654535c3ab24ef9c39dcdeb996a1194dc4afeb6fc2 WHIRLPOOL 253c90c721b6fb25333a7d4198c2626aa6da328a62b5d3794a257358b89aad19664c2e69be8ca475097a4458e49d8be2f59eb80707607785e63ec42a7430afbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDDSFkACgkQG7kqcTWJkGfMRQP/V0HKLHoBPer3nXKgybqtHpd1
-S2TVsSf0udvqtAn988JUVXRc1UXx+hDfIi7ZF6PgItA5dMTBEYpTRCoCasF59XcP
-bIPqzwhLP76A4FexrhFdK8A0uoyK36sN8Hec5uE9XThWJvt88SbRN/xJuhwBnm7F
-bYotCW0VXBloiklWJH4=
-=k0Ao
+iJwEAQEIAAYFAlDUuD0ACgkQG7kqcTWJkGca9AP/WeHUgR8auDN2eyEy750vxPHq
+Grq+O0bWyxEJ1lr0KqWS5LXoYwXvRDEHJnPRWLNMBPc7RsLQCP1Pt2/Lkywrlut6
+2YP+qqb46rTBvuzEnu10hRUZi2/ijpj1/gpmUGoeWwcwJxfF367byp+IrkFIaYhC
+Cz5G+H6wMaeI6xUsQVU=
+=D9TY
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/eina/eina-1.7.3.ebuild b/dev-libs/eina/eina-1.7.3.ebuild
deleted file mode 100644
index dd61ff0d4f1f..000000000000
--- a/dev-libs/eina/eina-1.7.3.ebuild
+++ /dev/null
@@ -1,67 +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/eina/eina-1.7.3.ebuild,v 1.1 2012/12/08 14:01:55 tommy Exp $
-
-EAPI="2"
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment's data types library (List, hash, etc) in C"
-
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="altivec debug default-mempool mempool-buddy +mempool-chained
-	mempool-fixed-bitmap +mempool-pass-through
-	mmx sse sse2 static-libs test"
-
-RDEPEND="debug? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-libs/check
-		dev-libs/glib
-		dev-util/lcov
-	)"
-
-src_prepare() {
-	cp "${FILESDIR}"/city.h src/tests/ || die
-
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	local MODULE_ARGUMENT="static"
-	if use debug ; then
-		MODULE_ARGUMENT="yes"
-	fi
-
-	# Evas benchmark is broken!
-	MY_ECONF="
-	$(use_enable altivec cpu-altivec)
-	$(use_enable !debug amalgamation)
-	$(use_enable debug stringshare-usage)
-	$(use_enable debug assert)
-	$(use_enable debug valgrind)
-	$(use debug || echo " --with-internal-maximum-log-level=2")
-	$(use_enable default-mempool)
-	$(use_enable doc)
-	$(use_enable mempool-buddy mempool-buddy $MODULE_ARGUMENT)
-	$(use_enable mempool-chained mempool-chained-pool $MODULE_ARGUMENT)
-	$(use_enable mempool-fixed-bitmap mempool-fixed-bitmap $MODULE_ARGUMENT)
-	$(use_enable mempool-pass-through mempool-pass-through $MODULE_ARGUMENT)
-	$(use_enable mmx cpu-mmx)
-	$(use_enable sse cpu-sse)
-	$(use_enable sse2 cpu-sse2)
-	$(use test && echo " --disable-amalgamation")
-	$(use_enable test e17)
-	$(use_enable test tests)
-	$(use_enable test benchmark)
-	$(use test && echo " --with-internal-maximum-log-level=6")
-	--enable-magic-debug
-	--enable-safety-checks
-	"
-
-	enlightenment_src_configure
-}
diff --git a/dev-libs/eina/eina-1.7.1.ebuild b/dev-libs/eina/eina-1.7.4.ebuild
index 2a4a44b52182..98a87a6adc30 100644
--- a/dev-libs/eina/eina-1.7.1.ebuild
+++ b/dev-libs/eina/eina-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.1.ebuild,v 1.2 2012/10/25 11:41:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.4.ebuild,v 1.1 2012/12/21 19:27:50 tommy Exp $
 
 EAPI="2"
 
@@ -25,12 +25,6 @@ DEPEND="${RDEPEND}
 		dev-util/lcov
 	)"
 
-src_prepare() {
-	cp "${FILESDIR}"/city.h src/tests/ || die
-
-	enlightenment_src_prepare
-}
-
 src_configure() {
 	local MODULE_ARGUMENT="static"
 	if use debug ; then
diff --git a/dev-libs/eina/files/city.h b/dev-libs/eina/files/city.h
deleted file mode 100644
index a9c297fee7ec..000000000000
--- a/dev-libs/eina/files/city.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) 2011 Google, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-// CityHash Version 1, by Geoff Pike and Jyrki Alakuijala
-//
-// This file provides a few functions for hashing strings. On x86-64
-// hardware in 2011, CityHash64() is faster than other high-quality
-// hash functions, such as Murmur.  This is largely due to higher
-// instruction-level parallelism.  CityHash64() and CityHash128() also perform
-// well on hash-quality tests.
-//
-// CityHash128() is optimized for relatively long strings and returns
-// a 128-bit hash.  For strings more than about 2000 bytes it can be
-// faster than CityHash64().
-//
-// Functions in the CityHash family are not suitable for cryptography.
-//
-// WARNING: This code has not been tested on big-endian platforms!
-// It is known to work well on little-endian platforms that have a small penalty
-// for unaligned reads, such as current Intel and AMD moderate-to-high-end CPUs.
-//
-// By the way, for some hash functions, given strings a and b, the hash
-// of a+b is easily derived from the hashes of a and b.  This property
-// doesn't hold for any hash functions in this file.
-
-#ifndef CITY_HASH_H_
-#define CITY_HASH_H_
-
-#include <stdlib.h>  // for size_t.
-#include <stdint.h>
-#include <utility>
-
-typedef uint8_t uint8;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-typedef std::pair<uint64, uint64> uint128;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-inline uint64 Uint128Low64(const uint128& x) { return x.first; }
-inline uint64 Uint128High64(const uint128& x) { return x.second; }
-
-// Hash function for a byte array.
-uint64 CityHash64(const char *buf, size_t len);
-// Hash function for a byte array.  For convenience, a 64-bit seed is also
-// hashed into the result.
-uint64 CityHash64WithSeed(const char *buf, size_t len, uint64 seed);
-
-// Hash function for a byte array.  For convenience, two seeds are also
-// hashed into the result.
-uint64 CityHash64WithSeeds(const char *buf, size_t len,
-                           uint64 seed0, uint64 seed1);
-
-// Hash function for a byte array.
-uint128 CityHash128(const char *s, size_t len);
-
-// Hash function for a byte array.  For convenience, a 128-bit seed is also
-// hashed into the result.
-uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed);
-
-// Hash 128 input bits down to 64 bits of output.
-// This is intended to be a reasonably good hash function.
-inline uint64 Hash128to64(const uint128& x) {
-  // Murmur-inspired hashing.
-  const uint64 kMul = 0x9ddfea08eb382d69ULL;
-  uint64 a = (Uint128Low64(x) ^ Uint128High64(x)) * kMul;
-  a ^= (a >> 47);
-  uint64 b = (Uint128High64(x) ^ a) * kMul;
-  b ^= (b >> 47);
-  b *= kMul;
-  return b;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // CITY_HASH_H_