Version bump, drop old

(Portage version: 2.2.0_alpha149-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)

4 files changed, 8 insertions, 171 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/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_