diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/ebuild-writing/eapi.xmli | 32 | ||||
| -rw-r--r-- | content/general-concepts/dependencies.xmli | 3 | ||||
| -rw-r--r-- | content/quickstart.xmli | 100 |
3 files changed, 75 insertions, 60 deletions
diff --git a/content/ebuild-writing/eapi.xmli b/content/ebuild-writing/eapi.xmli index 45e0e46..4341038 100644 --- a/content/ebuild-writing/eapi.xmli +++ b/content/ebuild-writing/eapi.xmli @@ -23,11 +23,11 @@ </para> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="1" +EAPI=1 inherit eutils @@ -107,11 +107,11 @@ src_compile() { </important> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="1" +EAPI=1 IUSE="foo +bar" ]]></programlisting> @@ -319,4 +319,28 @@ src_compile() { </varlistentry> </variablelist> </section> +<section> +<title>EAPI="3"</title> +<body> + +<ul> + <li> + <p><b>Gentoo Prefix support</b></p> + <p> + Support for the <c>EPREFIX</c>, <c>EROOT</c>, and <c>ED</c> + variables. If an ebuild uses one of these, it must be EAPI3 aware. + </p> + </li> + <li> + <p><b>src_unpack() .tar.xz support</b></p> + <p> + Support for the <c>.tar.xz</c> format from upstream tarballs. + unpack() in src_unpack() will only operate on a .tar.xz tarball if + the ebuild is EAPI3 aware. + </p> + </li> +</ul> + +</body> +</section> </section> diff --git a/content/general-concepts/dependencies.xmli b/content/general-concepts/dependencies.xmli index a654f02..bd99d24 100644 --- a/content/general-concepts/dependencies.xmli +++ b/content/general-concepts/dependencies.xmli @@ -422,8 +422,7 @@ DEPEND="baz? ( || ( app-misc/foo app-misc/bar ) )" <title>Legacy Inverse USE-Conditional Dependency Syntax</title> <para> - When looking through old ebuild versions or the occasional user-submitted ebuild, you may see a - <varname>*DEPEND</varname> atom in the form: + Once upon a time the ? conditional operator was allowed in <command>*DEPEND</command>: </para> <programlisting language="ebuild"><![CDATA[ diff --git a/content/quickstart.xmli b/content/quickstart.xmli index a8309f7..6d4c57b 100644 --- a/content/quickstart.xmli +++ b/content/quickstart.xmli @@ -31,7 +31,7 @@ </para> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -46,11 +46,11 @@ IUSE="" src_compile() { econf --with-posix-regex - emake || die "emake failed" + emake || die } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die dodoc FAQ NEWS README || die dohtml EXTENDING.html ctags.html @@ -174,7 +174,7 @@ src_install() { </para> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -184,21 +184,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~hppa mips sparc x86" +KEYWORDS="~hppa ~mips sparc x86" IUSE="" -DEPEND="dev-libs/popt - sys-devel/flex - sys-devel/bison" RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison" src_compile() { econf --with-popt - emake || die "emake failed" + emake || die } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die dodoc README CHANGES || die } ]]></programlisting> @@ -233,7 +233,7 @@ src_install() { </para> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -248,26 +248,26 @@ SLOT="0" KEYWORDS="~hppa ~mips ~sparc ~x86" IUSE="" -DEPEND="dev-libs/popt - sys-devel/flex - sys-devel/bison" -RDEPEND="dev-libs/popt" +DEPEND="dev-libs/popt" +RDEPEND="${DEPEND} + sys-devel/flex + sys-devel/bison" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-destdir.patch - epatch "${FILESDIR}"/${P}-parallel_build.patch + epatch "${FILESDIR}"/${P}-destdir.patch \ + "${FILESDIR}"/${P}-parallel_build.patch } src_compile() { econf --with-popt - emake || die "emake failed" + emake || die } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die dodoc README CHANGES || die } ]]></programlisting> @@ -290,21 +290,20 @@ src_install() { </para> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" -SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz" HOMEPAGE="http://www.gnu.org/software/libiconv/" +SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz" SLOT="0" LICENSE="LGPL-2.1" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="nls" -DEPEND="virtual/libc - !sys-libs/glibc" +DEPEND="sys-libs/glibc" src_compile() { econf $(use_enable nls) @@ -312,7 +311,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install || die } ]]></programlisting> @@ -336,7 +335,7 @@ src_install() { </para> <programlisting language="ebuild"><![CDATA[ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -352,25 +351,26 @@ SLOT="0" IUSE="crypt gnome imlib ipv6 ldap nls pda ssl xface" -DEPEND="=x11-libs/gtk+-1.2* - nls? ( >=sys-devel/gettext-0.12.1 ) - crypt? ( >=app-crypt/gpgme-0.4.5 ) - gnome? ( media-libs/gdk-pixbuf ) - imlib? ( media-libs/imlib ) - ldap? ( >=net-nds/openldap-2.0.11 ) - pda? ( app-pda/jpilot ) - ssl? ( dev-libs/openssl ) - xface? ( >=media-libs/compface-1.4 )" -RDEPEND="${DEPEND} - app-misc/mime-types - x11-misc/shared-mime-info" - +RDEPEND="=x11-libs/gtk+-1.2* + nls? ( >=sys-devel/gettext-0.12.1 ) + crypt? ( >=app-crypt/gpgme-0.4.5 ) + imlib? ( media-libs/imlib2 ) + ldap? ( >=net-nds/openldap-2.0.11 ) + pda? ( app-pda/jpilot ) + ssl? ( dev-libs/openssl ) + xface? ( >=media-libs/compface-1.4 ) + app-misc/mime-types + x11-misc/shared-mime-info" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( >=sys-devel/gettext-0.12.1 )" + src_unpack() { - unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-namespace.diff - epatch "${FILESDIR}"/${PN}-procmime.diff + epatch "${FILESDIR}"/${PN}-namespace.diff \ + "${FILESDIR}"/${PN}-procmime.diff } src_compile() { @@ -382,25 +382,17 @@ src_compile() { $(use_enable ldap) \ $(use_enable ipv6) \ $(use_enable imlib) \ - $(use_enable gnome gdk-pixbuf) \ $(use_enable xface compface) emake || die } src_install() { - einstall || die "einstall failed" - dodir /usr/share/pixmaps - insinto /usr/share/pixmaps - doins *.png - - if use gnome ; then - dodir /usr/share/gnome/apps/Internet - insinto /usr/share/gnome/apps/Internet - doins sylpheed.desktop - fi - - dodoc [A-Z][A-Z]* ChangeLog* || die + emake DESTDIR="${D}" install || die + + doicon sylpheed.png + domenu sylpheed.desktop + dodoc [A-Z][A-Z]* ChangeLog* || die } ]]></programlisting> |