diff options
Diffstat (limited to 'dev-libs/eet')
| -rw-r--r-- | dev-libs/eet/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/eet/eet-1.7.8.ebuild | 61 | ||||
| -rw-r--r-- | dev-libs/eet/eet-9999.ebuild (renamed from dev-libs/eet/eet-1.7.6.ebuild) | 61 |
3 files changed, 79 insertions, 51 deletions
diff --git a/dev-libs/eet/ChangeLog b/dev-libs/eet/ChangeLog index 4f00f841ab6f..3928a52b3923 100644 --- a/dev-libs/eet/ChangeLog +++ b/dev-libs/eet/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/eet # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/ChangeLog,v 1.29 2013/08/04 10:04:39 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/ChangeLog,v 1.30 2013/09/28 09:13:18 vapier Exp $ + +*eet-9999 (28 Sep 2013) + + 28 Sep 2013; Mike Frysinger <vapier@gentoo.org> +eet-9999.ebuild, + -eet-1.7.6.ebuild, eet-1.7.8.ebuild: + Clean up ebuild and merge live git version from E overlay. *eet-1.7.8 (04 Aug 2013) diff --git a/dev-libs/eet/eet-1.7.8.ebuild b/dev-libs/eet/eet-1.7.8.ebuild index 23132ee3e525..4184fdb8bd06 100644 --- a/dev-libs/eet/eet-1.7.8.ebuild +++ b/dev-libs/eet/eet-1.7.8.ebuild @@ -1,64 +1,75 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.8.ebuild,v 1.1 2013/08/04 10:04:39 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.8.ebuild,v 1.2 2013/09/28 09:13:18 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="E file chunk reading/writing library" HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eet" -SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2" LICENSE="BSD-2" -KEYWORDS="~amd64 ~arm ~ppc ~x86" IUSE="debug examples gnutls ssl static-libs test" -RDEPEND=">=dev-libs/eina-1.7.8 +RDEPEND=">=dev-libs/eina-${PV} virtual/jpeg sys-libs/zlib - gnutls? ( net-libs/gnutls - dev-libs/libgcrypt ) + gnutls? ( + net-libs/gnutls + dev-libs/libgcrypt + ) !gnutls? ( ssl? ( dev-libs/openssl ) )" DEPEND="${RDEPEND} - test? ( dev-libs/check - dev-util/lcov )" + test? ( + dev-libs/check + dev-util/lcov + )" src_configure() { - local SSL_FLAGS="" + E_ECONF=( + $(use_enable debug assert) + $(use_enable doc) + $(use_enable examples build-examples) + $(use_enable examples install-examples) + $(use_enable test tests) + ) if use gnutls; then if use ssl; then ewarn "You have enabled both 'ssl' and 'gnutls', so we will use" ewarn "gnutls and not openssl for cipher and signature support" fi - SSL_FLAGS=" + E_ECONF+=( --enable-cipher --enable-signature --disable-openssl - --enable-gnutls" + --enable-gnutls + ) elif use ssl; then - SSL_FLAGS=" + E_ECONF+=( --enable-cipher --enable-signature --enable-openssl - --disable-gnutls" + --disable-gnutls + ) else - SSL_FLAGS=" + E_ECONF+=( --disable-cipher --disable-signature --disable-openssl - --disable-gnutls" + --disable-gnutls + ) fi - export MY_ECONF=" - $(use_enable debug assert) - $(use_enable doc) - $(use_enable examples build-examples) - $(use_enable examples install-examples) - $(use_enable test tests) - ${SSL_FLAGS} - ${MY_ECONF}" - enlightenment_src_configure } diff --git a/dev-libs/eet/eet-1.7.6.ebuild b/dev-libs/eet/eet-9999.ebuild index 6dac6628363b..db77a5da2be9 100644 --- a/dev-libs/eet/eet-1.7.6.ebuild +++ b/dev-libs/eet/eet-9999.ebuild @@ -1,64 +1,75 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-1.7.6.ebuild,v 1.2 2013/04/24 08:26:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/eet/eet-9999.ebuild,v 1.6 2013/09/28 09:13:18 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="E file chunk reading/writing library" HOMEPAGE="http://trac.enlightenment.org/e/wiki/Eet" -SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2" LICENSE="BSD-2" -KEYWORDS="~amd64 ~arm ~ppc ~x86" IUSE="debug examples gnutls ssl static-libs test" -RDEPEND=">=dev-libs/eina-1.7.6 +RDEPEND=">=dev-libs/eina-${PV} virtual/jpeg sys-libs/zlib - gnutls? ( net-libs/gnutls - dev-libs/libgcrypt ) + gnutls? ( + net-libs/gnutls + dev-libs/libgcrypt + ) !gnutls? ( ssl? ( dev-libs/openssl ) )" DEPEND="${RDEPEND} - test? ( dev-libs/check - dev-util/lcov )" + test? ( + dev-libs/check + dev-util/lcov + )" src_configure() { - local SSL_FLAGS="" + E_ECONF=( + $(use_enable debug assert) + $(use_enable doc) + $(use_enable examples build-examples) + $(use_enable examples install-examples) + $(use_enable test tests) + ) if use gnutls; then if use ssl; then ewarn "You have enabled both 'ssl' and 'gnutls', so we will use" ewarn "gnutls and not openssl for cipher and signature support" fi - SSL_FLAGS=" + E_ECONF+=( --enable-cipher --enable-signature --disable-openssl - --enable-gnutls" + --enable-gnutls + ) elif use ssl; then - SSL_FLAGS=" + E_ECONF+=( --enable-cipher --enable-signature --enable-openssl - --disable-gnutls" + --disable-gnutls + ) else - SSL_FLAGS=" + E_ECONF+=( --disable-cipher --disable-signature --disable-openssl - --disable-gnutls" + --disable-gnutls + ) fi - export MY_ECONF=" - $(use_enable debug assert) - $(use_enable doc) - $(use_enable examples build-examples) - $(use_enable examples install-examples) - $(use_enable test tests) - ${SSL_FLAGS} - ${MY_ECONF}" - enlightenment_src_configure } |