From 14664b030ed44382adbf4ee79af36b42e130eb39 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Thu, 1 Apr 2010 21:33:17 +0000 Subject: [PATCH] Bump to EAPI=3, add prefix keywords Package-Manager: portage--svn/cvs/Linux i686 --- app-crypt/gnupg/ChangeLog | 6 +++++- app-crypt/gnupg/gnupg-1.4.10.ebuild | 14 +++++++------- app-crypt/gnupg/gnupg-2.0.14.ebuild | 16 ++++++++-------- app-crypt/gnupg/gnupg-2.0.15.ebuild | 14 +++++++------- app-crypt/gpgme/ChangeLog | 6 +++++- app-crypt/gpgme/gpgme-1.2.0.ebuild | 14 +++++++------- app-crypt/gpgme/gpgme-1.3.0.ebuild | 14 +++++++------- app-crypt/steghide/ChangeLog | 5 ++++- app-crypt/steghide/steghide-0.5.1.ebuild | 22 ++++++++++++---------- 9 files changed, 62 insertions(+), 49 deletions(-) diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index fa132b08a437..681ccaf567c4 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.366 2010/03/10 18:55:07 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.367 2010/04/01 21:28:21 abcd Exp $ + + 01 Apr 2010; Jonathan Callen gnupg-1.4.10.ebuild, + gnupg-2.0.14.ebuild, gnupg-2.0.15.ebuild: + Bump to EAPI=3, add prefix keywords *gnupg-2.0.15 (10 Mar 2010) diff --git a/app-crypt/gnupg/gnupg-1.4.10.ebuild b/app-crypt/gnupg/gnupg-1.4.10.ebuild index 71f0779f0cf4..3a2eb1ee211b 100644 --- a/app-crypt/gnupg/gnupg-1.4.10.ebuild +++ b/app-crypt/gnupg/gnupg-1.4.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10.ebuild,v 1.8 2009/10/28 18:30:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.10.ebuild,v 1.9 2010/04/01 21:28:21 abcd Exp $ -EAPI="2" +EAPI="3" inherit eutils flag-o-matic toolchain-funcs @@ -21,7 +21,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="bzip2 bindist curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru" #IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib linguas_ru" @@ -91,7 +91,7 @@ src_configure() { use static &&append-ldflags -static econf \ - --docdir="/usr/share/doc/${PF}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_enable ldap) \ --enable-mailto \ --enable-hkp \ @@ -107,7 +107,7 @@ src_configure() { $(use_with usb libusb /usr) \ $(use_enable static) \ --enable-static-rnd=linux \ - --libexecdir=/usr/libexec \ + --libexecdir="${EPREFIX}/usr/libexec" \ --enable-noexecstack \ CC_FOR_BUILD=$(tc-getBUILD_CC) \ ${myconf} @@ -117,7 +117,7 @@ src_install() { emake DESTDIR="${D}" install || die "emake install failed" # keep the documentation in /usr/share/doc/... - rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html" + rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \ TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP,faq.raw} diff --git a/app-crypt/gnupg/gnupg-2.0.14.ebuild b/app-crypt/gnupg/gnupg-2.0.14.ebuild index 510dd0785b18..b7b4a0d87048 100644 --- a/app-crypt/gnupg/gnupg-2.0.14.ebuild +++ b/app-crypt/gnupg/gnupg-2.0.14.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.8 2010/02/12 20:22:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.9 2010/04/01 21:28:21 abcd Exp $ -EAPI="2" +EAPI="3" inherit flag-o-matic toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard" COMMON_DEPEND_LIBS=" @@ -52,7 +52,7 @@ src_configure() { use static && append-ldflags -static econf \ - --docdir="/usr/share/doc/${PF}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --enable-symcryptrun \ --enable-gpg \ --enable-gpgsm \ @@ -78,8 +78,8 @@ src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc ChangeLog NEWS README THANKS TODO VERSION - mv "${D}usr/share/gnupg/help"* "${D}usr/share/doc/${PF}" - ecompressdir "/usr/share/doc/${P}" + mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}" + ecompressdir "/usr/share/doc/${PF}" dosym gpg2 /usr/bin/gpg dosym gpgv2 /usr/bin/gpgv @@ -87,8 +87,8 @@ src_install() { dosym gpg2keys_finger /usr/libexec/gpgkeys_finger dosym gpg2keys_curl /usr/libexec/gpgkeys_curl use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap - echo ".so man1/gpg2.1" > "${D}usr/share/man/man1/gpg.1" - echo ".so man1/gpgv2.1" > "${D}usr/share/man/man1/gpgv.1" + echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1" + echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1" use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png } diff --git a/app-crypt/gnupg/gnupg-2.0.15.ebuild b/app-crypt/gnupg/gnupg-2.0.15.ebuild index cfd4a0989cd4..d72662ebf6ca 100644 --- a/app-crypt/gnupg/gnupg-2.0.15.ebuild +++ b/app-crypt/gnupg/gnupg-2.0.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.1 2010/03/10 18:55:07 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.2 2010/04/01 21:28:21 abcd Exp $ EAPI="3" @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard" COMMON_DEPEND_LIBS=" @@ -52,7 +52,7 @@ src_configure() { use static && append-ldflags -static econf \ - --docdir="/usr/share/doc/${PF}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --enable-symcryptrun \ --enable-gpg \ --enable-gpgsm \ @@ -78,8 +78,8 @@ src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc ChangeLog NEWS README THANKS TODO VERSION - mv "${D}usr/share/gnupg/help"* "${D}usr/share/doc/${PF}" - ecompressdir "/usr/share/doc/${P}" + mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}" + ecompressdir "/usr/share/doc/${PF}" dosym gpg2 /usr/bin/gpg dosym gpgv2 /usr/bin/gpgv @@ -87,8 +87,8 @@ src_install() { dosym gpg2keys_finger /usr/libexec/gpgkeys_finger dosym gpg2keys_curl /usr/libexec/gpgkeys_curl use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap - echo ".so man1/gpg2.1" > "${D}usr/share/man/man1/gpg.1" - echo ".so man1/gpgv2.1" > "${D}usr/share/man/man1/gpgv.1" + echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1" + echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1" use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png } diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog index cf213e75e7fa..6ef65a3492b8 100644 --- a/app-crypt/gpgme/ChangeLog +++ b/app-crypt/gpgme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gpgme # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.174 2010/01/16 16:45:56 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.175 2010/04/01 21:30:45 abcd Exp $ + + 01 Apr 2010; Jonathan Callen gpgme-1.2.0.ebuild, + gpgme-1.3.0.ebuild: + Bump to EAPI=3, add prefix keywords 16 Jan 2010; Raúl Porcel gpgme-1.2.0.ebuild: ia64/sparc stable wrt #278625 diff --git a/app-crypt/gpgme/gpgme-1.2.0.ebuild b/app-crypt/gpgme/gpgme-1.2.0.ebuild index 5db7c008826f..1107ac0ff717 100644 --- a/app-crypt/gpgme/gpgme-1.2.0.ebuild +++ b/app-crypt/gpgme/gpgme-1.2.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.2.0.ebuild,v 1.10 2010/01/16 16:45:56 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.2.0.ebuild,v 1.11 2010/04/01 21:30:45 abcd Exp $ -EAPI="2" +EAPI="3" inherit libtool eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="1" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="common-lisp pth" DEPEND=">=dev-libs/libgpg-error-1.4 @@ -30,9 +30,9 @@ src_prepare() { src_configure() { econf \ - --includedir=/usr/include/gpgme \ - --with-gpg=/usr/bin/gpg \ - --with-gpgsm=/usr/bin/gpgsm \ + --includedir="${EPREFIX}/usr/include/gpgme" \ + --with-gpg="${EPREFIX}/usr/bin/gpg" \ + --with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \ $(use_with pth) } @@ -41,6 +41,6 @@ src_install() { dodoc AUTHORS ChangeLog NEWS README THANKS TODO if ! use common-lisp; then - rm -fr "${D}usr/share/common-lisp" + rm -fr "${ED}usr/share/common-lisp" fi } diff --git a/app-crypt/gpgme/gpgme-1.3.0.ebuild b/app-crypt/gpgme/gpgme-1.3.0.ebuild index bd5188fb3469..ed1a13db4749 100644 --- a/app-crypt/gpgme/gpgme-1.3.0.ebuild +++ b/app-crypt/gpgme/gpgme-1.3.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.0.ebuild,v 1.1 2010/01/11 19:18:50 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.0.ebuild,v 1.2 2010/04/01 21:30:45 abcd Exp $ -EAPI="2" +EAPI="3" inherit eutils libtool @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="common-lisp pth" DEPEND="app-crypt/gnupg @@ -30,9 +30,9 @@ src_prepare() { src_configure() { econf \ - --includedir=/usr/include/gpgme \ - --with-gpg=/usr/bin/gpg \ - --with-gpgsm=/usr/bin/gpgsm \ + --includedir="${EPREFIX}/usr/include/gpgme" \ + --with-gpg="${EPREFIX}/usr/bin/gpg" \ + --with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \ $(use_with pth) } @@ -41,6 +41,6 @@ src_install() { dodoc AUTHORS ChangeLog NEWS README THANKS TODO if ! use common-lisp; then - rm -fr "${D}usr/share/common-lisp" + rm -fr "${ED}usr/share/common-lisp" fi } diff --git a/app-crypt/steghide/ChangeLog b/app-crypt/steghide/ChangeLog index c50e2ec34446..3428aee28286 100644 --- a/app-crypt/steghide/ChangeLog +++ b/app-crypt/steghide/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/steghide # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.18 2010/01/22 16:39:58 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.19 2010/04/01 21:33:17 abcd Exp $ + + 01 Apr 2010; Jonathan Callen steghide-0.5.1.ebuild: + Bump to EAPI=3, add prefix keywords 22 Jan 2010; Samuli Suominen steghide-0.5.1.ebuild: Require SLOT="0" of media-libs/jpeg for headers. diff --git a/app-crypt/steghide/steghide-0.5.1.ebuild b/app-crypt/steghide/steghide-0.5.1.ebuild index 2668923f4e3e..af6a8a025638 100644 --- a/app-crypt/steghide/steghide-0.5.1.ebuild +++ b/app-crypt/steghide/steghide-0.5.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/steghide-0.5.1.ebuild,v 1.13 2010/01/22 16:39:58 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/steghide-0.5.1.ebuild,v 1.14 2010/04/01 21:33:17 abcd Exp $ -EAPI=1 +EAPI="3" inherit autotools eutils DESCRIPTION="A steganography program which hides data in various media files" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="debug" DEPEND=">=app-crypt/mhash-0.8.18-r1 @@ -19,22 +19,24 @@ DEPEND=">=app-crypt/mhash-0.8.18-r1 media-libs/jpeg:0 >=sys-libs/zlib-1.1.4-r2" -src_unpack(){ - unpack ${A} - cd "${S}" +src_prepare(){ epatch "${FILESDIR}"/${P}-gcc34.patch \ "${FILESDIR}"/${P}-gcc4.patch \ "${FILESDIR}"/${P}-gcc43.patch eautoreconf } -src_compile() { +src_configure() { econf $(use_enable debug) - emake LIBTOOL="$(type -p libtool)" || die "emake failed." +} + +src_compile() { + local libtool + [[ ${CHOST} == *-darwin* ]] && libtool=$(type -P glibtool) || libtool=$(type -P libtool) + emake LIBTOOL="${libtool}" || die "emake failed" } src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install \ - || die "emake install failed." + emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install || die "emake install failed" prepalldocs } -- 2.26.2