From d48fcf640920d627b48eafe80f62521a89b1dff0 Mon Sep 17 00:00:00 2001 From: hwoarang Date: Sun, 22 Aug 2010 21:20:11 +0300 Subject: Backported few more patches *2c470cdbf6f36dd30b5b453ff0bc828b4391e7a1 *4616215bf547c127364c87ae432d79a2d845e079 *7219f44d461217c66f0de3552f9893cdb2ced7bb *7219f44d461217c66f0de3552f9893cdb2ced7bb --- content/ebuild-writing/eapi.xmli | 32 +++++++-- content/general-concepts/dependencies.xmli | 3 +- 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 @@ @@ -319,4 +319,28 @@ src_compile() { +
+EAPI="3" + + +
    +
  • +

    Gentoo Prefix support

    +

    + Support for the EPREFIX, EROOT, and ED + variables. If an ebuild uses one of these, it must be EAPI3 aware. +

    +
    • +
  • +

    src_unpack() .tar.xz support

    +

    + Support for the .tar.xz format from upstream tarballs. + unpack() in src_unpack() will only operate on a .tar.xz tarball if + the ebuild is EAPI3 aware. +

    +
    • +
+ + +
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 ) )" Legacy Inverse USE-Conditional Dependency Syntax - When looking through old ebuild versions or the occasional user-submitted ebuild, you may see a - *DEPEND atom in the form: + Once upon a time the ? conditional operator was allowed in *DEPEND: @@ -233,7 +233,7 @@ src_install() { @@ -290,21 +290,20 @@ src_install() { @@ -336,7 +335,7 @@ src_install() { =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 } ]]> -- cgit v1.2.3