[gentoo-commits] gentoo-x86 commit in dev-libs/eina: eina-9999.ebuild metadata.xml eina-1.7.8.ebuild ChangeLog eina-1.7.6.ebuild

[Mike Frysinger (vapier)]

vapier      13/09/28 08:59:59

  Modified:             metadata.xml eina-1.7.8.ebuild ChangeLog
  Added:                eina-9999.ebuild
  Removed:              eina-1.7.6.ebuild
  Log:
  Clean up ebuild and merge live git version from E overlay.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.2                  dev-libs/eina/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/eina/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	18 Nov 2010 12:29:04 -0000	1.1
+++ metadata.xml	28 Sep 2013 08:59:59 -0000	1.2
@@ -3,11 +3,13 @@
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name="mempool-chained">Compile "chained-pool" memory pool allocation.</flag>
+ <flag name="mempool-buddy">Compile "buddy" memory pool allocation.</flag>
+ <flag name="mempool-chained-pool">Compile "chained-pool" memory pool allocation.</flag>
  <flag name="mempool-fixed-bitmap">Compile "fixed-bitmap" memory pool allocation.</flag>
+ <flag name="mempool-one-big">Compile "one-big" memory pool allocation.</flag>
  <flag name="mempool-pass-through">Compile "pass-through" (system's malloc) memory pool allocation.</flag>
- <flag name="mempool-buddy">Compile "buddy" memory pool allocation.</flag>
  <flag name="default-mempool">By default use system's allocator (pass-through) instead of custom choice for Eina's own data structures.</flag>
+ <flag name="valgrind">Compile in valgrind hints for smoother integration.</flag>
 </use>
 <longdescription>
 Eina is a multi-platform library that provides optimized data types



1.2                  dev-libs/eina/eina-1.7.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/eina-1.7.8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/eina-1.7.8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/eina-1.7.8.ebuild?r1=1.1&r2=1.2

Index: eina-1.7.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eina-1.7.8.ebuild	4 Aug 2013 09:39:51 -0000	1.1
+++ eina-1.7.8.ebuild	28 Sep 2013 08:59:59 -0000	1.2
@@ -1,22 +1,41 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.8.ebuild,v 1.1 2013/08/04 09:39:51 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-1.7.8.ebuild,v 1.2 2013/09/28 08:59:59 vapier Exp $
 
-EAPI="2"
+EAPI="4"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_SUB_PROJECT="legacy"
+	EGIT_URI_APPEND=${PN}
+	EGIT_BRANCH=${PN}-1.7
+else
+	SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+	EKEY_STATE="snap"
+fi
 
 inherit enlightenment
 
-DESCRIPTION="Enlightenment's data types library (List, hash, etc) in C"
+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"
+IUSE="altivec debug default-mempool mmx sse sse2 static-libs test valgrind"
 
-KEYWORDS="~amd64 ~arm ~ppc ~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 )"
+MEMPOOLS=(
+	@buddy
+	+@chained-pool
+	# Looks like ememoa is a dead project?
+	#@ememoa-fixed
+	#@ememoa-unknown
+	@fixed-bitmap
+	+@one-big
+	@pass-through
+)
+IUSE_MEMPOOLS=${MEMPOOLS[@]/@/mempool-}
+IUSE+=" ${IUSE_MEMPOOLS}"
+
+RDEPEND="valgrind? ( dev-util/valgrind )"
+#	mempool-ememoa-fixed? ( sys-libs/ememoa )
+#	mempool-ememoa-unknown? ( sys-libs/ememoa )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
@@ -26,36 +45,41 @@
 	)"
 
 src_configure() {
-	local MODULE_ARGUMENT="static"
+	# Evas benchmark is broken!
+	E_ECONF=(
+		$(use_enable altivec cpu-altivec)
+		$(use_enable !debug amalgamation)
+		$(use_enable debug stringshare-usage)
+		$(use_enable debug assert)
+		$(use debug || echo " --with-internal-maximum-log-level=2")
+		$(use_enable default-mempool)
+		$(use_enable doc)
+		$(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")
+		$(use_enable valgrind)
+		--enable-magic-debug
+		--enable-safety-checks
+	)
+
+	#if use mempool-ememoa-fixed || use mempool-ememoa-unknown ; then
+	#	E_ECONF+=( --enable-ememoa )
+	#else
+		E_ECONF+=( --disable-ememoa )
+	#fi
+
+	local m mempool_arg='static'
 	if use debug ; then
-		MODULE_ARGUMENT="yes"
+		mempool_arg='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
-	"
+	for m in ${IUSE_MEMPOOLS//+} ; do
+		E_ECONF+=( $(use_enable ${m} ${m} ${MODULE_ARGUMENT}) )
+	done
 
 	enlightenment_src_configure
 }



1.20                 dev-libs/eina/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/ChangeLog?r1=1.19&r2=1.20

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/eina/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	4 Aug 2013 09:39:51 -0000	1.19
+++ ChangeLog	28 Sep 2013 08:59:59 -0000	1.20
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/eina
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/ChangeLog,v 1.19 2013/08/04 09:39:51 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/ChangeLog,v 1.20 2013/09/28 08:59:59 vapier Exp $
+
+*eina-9999 (28 Sep 2013)
+
+  28 Sep 2013; Mike Frysinger <vapier@g.o> +eina-9999.ebuild,
+  -eina-1.7.6.ebuild, eina-1.7.8.ebuild, metadata.xml:
+  Clean up ebuild and merge live git version from E overlay.
 
 *eina-1.7.8 (04 Aug 2013)
 



1.1                  dev-libs/eina/eina-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/eina-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/eina/eina-9999.ebuild?rev=1.1&content-type=text/plain

Index: eina-9999.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/eina/eina-9999.ebuild,v 1.1 2013/09/28 08:59:59 vapier Exp $

EAPI="4"

if [[ ${PV} == "9999" ]] ; then
	EGIT_SUB_PROJECT="legacy"
	EGIT_URI_APPEND=${PN}
	EGIT_BRANCH=${PN}-1.7
else
	SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
	EKEY_STATE="snap"
fi

inherit enlightenment

DESCRIPTION="Enlightenment's data types library (list, hash, etc) in C"

LICENSE="LGPL-2.1"
IUSE="altivec debug default-mempool mmx sse sse2 static-libs test valgrind"

MEMPOOLS=(
	@buddy
	+@chained-pool
	# Looks like ememoa is a dead project?
	#@ememoa-fixed
	#@ememoa-unknown
	@fixed-bitmap
	+@one-big
	@pass-through
)
IUSE_MEMPOOLS=${MEMPOOLS[@]/@/mempool-}
IUSE+=" ${IUSE_MEMPOOLS}"

RDEPEND="valgrind? ( dev-util/valgrind )"
#	mempool-ememoa-fixed? ( sys-libs/ememoa )
#	mempool-ememoa-unknown? ( sys-libs/ememoa )"
DEPEND="${RDEPEND}
	virtual/pkgconfig
	test? (
		dev-libs/check
		dev-libs/glib
		dev-util/lcov
	)"

src_configure() {
	# Evas benchmark is broken!
	E_ECONF=(
		$(use_enable altivec cpu-altivec)
		$(use_enable !debug amalgamation)
		$(use_enable debug stringshare-usage)
		$(use_enable debug assert)
		$(use debug || echo " --with-internal-maximum-log-level=2")
		$(use_enable default-mempool)
		$(use_enable doc)
		$(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")
		$(use_enable valgrind)
		--enable-magic-debug
		--enable-safety-checks
	)

	#if use mempool-ememoa-fixed || use mempool-ememoa-unknown ; then
	#	E_ECONF+=( --enable-ememoa )
	#else
		E_ECONF+=( --disable-ememoa )
	#fi

	local m mempool_arg='static'
	if use debug ; then
		mempool_arg='yes'
	fi
	for m in ${IUSE_MEMPOOLS//+} ; do
		E_ECONF+=( $(use_enable ${m} ${m} ${MODULE_ARGUMENT}) )
	done

	enlightenment_src_configure
}