summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-01-05 18:12:31 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-01-05 18:12:31 +0000
commit97177ecfab3e38ffc609caf2df63ad965e09399c (patch)
tree3b71f6cbbd1b3f039ad57ec76a22de03e4d14f67 /www-client/dillo
parentamd64/x86 stable (diff)
downloadgentoo-2-97177ecfab3e38ffc609caf2df63ad965e09399c.tar.gz
gentoo-2-97177ecfab3e38ffc609caf2df63ad965e09399c.tar.bz2
gentoo-2-97177ecfab3e38ffc609caf2df63ad965e09399c.zip
old
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'www-client/dillo')
-rw-r--r--www-client/dillo/ChangeLog9
-rw-r--r--www-client/dillo/dillo-2.2.1.ebuild64
-rw-r--r--www-client/dillo/dillo-2.2.ebuild30
-rw-r--r--www-client/dillo/dillo-9999.ebuild67
-rw-r--r--www-client/dillo/files/dillo.pngbin6135 -> 0 bytes
5 files changed, 24 insertions, 146 deletions
diff --git a/www-client/dillo/ChangeLog b/www-client/dillo/ChangeLog
index 4941373a7f11..c890efaea972 100644
--- a/www-client/dillo/ChangeLog
+++ b/www-client/dillo/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-client/dillo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.101 2012/01/05 18:07:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/ChangeLog,v 1.102 2012/01/05 18:12:31 ssuominen Exp $
+
+ 05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> dillo-2.2.ebuild:
+ Backport dillo.png move to mirrors (#370899)
+
+ 05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -dillo-2.2.1.ebuild,
+ -dillo-9999.ebuild, -files/dillo.png:
+ old
05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> dillo-3.0.1.ebuild:
amd64/x86 stable wrt #395917
diff --git a/www-client/dillo/dillo-2.2.1.ebuild b/www-client/dillo/dillo-2.2.1.ebuild
deleted file mode 100644
index 2068bebe0145..000000000000
--- a/www-client/dillo/dillo-2.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.1.ebuild,v 1.1 2011/08/01 15:38:08 patrick Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Lean FLTK2-based web browser"
-HOMEPAGE="http://www.dillo.org/"
-SRC_URI="http://www.dillo.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
- sys-libs/zlib
- jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-src_prepare() {
- epatch "${FILESDIR}"/dillo2-inbuf.patch
-}
-
-src_configure() {
- append-ldflags "-L/usr/$(get_libdir)/fltk"
- econf \
- $(use_enable gif) \
- $(use_enable ipv6) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable ssl)
-}
-
-src_compile() {
- emake || die "make failed"
- if use doc ; then
- doxygen Doxyfile || die "doxygen failed"
- fi
-}
-
-src_install() {
- dodir /etc
- emake DESTDIR="${D}" install || die "install failed"
-
- if use doc; then
- dohtml html/* || die "install documentation failed"
- fi
- dodoc AUTHORS ChangeLog README NEWS
- docinto doc
- dodoc doc/*.txt doc/README
-
- doicon "${FILESDIR}"/dillo.png
- make_desktop_entry dillo Dillo dillo
-}
-
-pkg_postinst() {
- elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
- elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/dillo-2.2.ebuild b/www-client/dillo/dillo-2.2.ebuild
index fec3d2d35b00..e60262c96703 100644
--- a/www-client/dillo/dillo-2.2.ebuild
+++ b/www-client/dillo/dillo-2.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.10 2010/11/08 12:38:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-2.2.ebuild,v 1.11 2012/01/05 18:12:31 ssuominen Exp $
-EAPI="2"
+EAPI=2
inherit eutils flag-o-matic multilib
DESCRIPTION="Lean FLTK2-based web browser"
HOMEPAGE="http://www.dillo.org/"
-SRC_URI="http://www.dillo.org/download/${P}.tar.bz2"
+SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
+ mirror://gentoo/${PN}.png"
LICENSE="GPL-3"
SLOT="0"
@@ -17,13 +18,14 @@ IUSE="doc +gif ipv6 +jpeg +png ssl"
RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
sys-libs/zlib
jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
- ssl? ( dev-libs/openssl )"
+ png? ( media-libs/libpng:0 )
+ ssl? ( dev-libs/openssl:0 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
src_prepare() {
- epatch "${FILESDIR}"/dillo2-inbuf.patch \
+ epatch \
+ "${FILESDIR}"/dillo2-inbuf.patch \
"${FILESDIR}"/${P}-libpng14.patch
}
@@ -38,25 +40,25 @@ src_configure() {
}
src_compile() {
- emake || die "make failed"
- if use doc ; then
- doxygen Doxyfile || die "doxygen failed"
+ emake || die
+ if use doc; then
+ doxygen Doxyfile || die
fi
}
src_install() {
dodir /etc
- emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install || die
if use doc; then
- dohtml html/* || die "install documentation failed"
+ dohtml html/* || die
fi
dodoc AUTHORS ChangeLog README NEWS
docinto doc
dodoc doc/*.txt doc/README
- doicon "${FILESDIR}"/dillo.png
- make_desktop_entry dillo Dillo dillo
+ doicon "${DISTDIR}"/dillo.png
+ make_desktop_entry dillo Dillo
}
pkg_postinst() {
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
deleted file mode 100644
index 740e7903ebe7..000000000000
--- a/www-client/dillo/dillo-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/dillo/dillo-9999.ebuild,v 1.5 2010/11/08 12:38:58 nelchael Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib mercurial
-
-DESCRIPTION="Lean FLTK2-based web browser"
-HOMEPAGE="http://www.dillo.org/"
-EHG_REPO_URI="http://hg.dillo.org/dillo"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="x11-libs/fltk:2[-cairo,jpeg=,png=]
- sys-libs/zlib
- jpeg? ( virtual/jpeg )
- png? ( media-libs/libpng )
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/dillo2-inbuf.patch
- ./autogen.sh
-}
-
-src_configure() {
- append-ldflags "-L/usr/$(get_libdir)/fltk"
- econf \
- $(use_enable gif) \
- $(use_enable ipv6) \
- $(use_enable jpeg) \
- $(use_enable png) \
- $(use_enable ssl)
-}
-
-src_compile() {
- emake || die "make failed"
- if use doc ; then
- doxygen Doxyfile || die "doxygen failed"
- fi
-}
-
-src_install() {
- dodir /etc
- emake DESTDIR="${D}" install || die "install failed"
-
- if use doc; then
- dohtml html/* || die "install documentation failed"
- fi
- dodoc AUTHORS ChangeLog README NEWS
- docinto doc
- dodoc doc/*.txt doc/README
-
- doicon "${FILESDIR}"/dillo.png
- make_desktop_entry dillo Dillo dillo
-}
-
-pkg_postinst() {
- elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
- elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/files/dillo.png b/www-client/dillo/files/dillo.png
deleted file mode 100644
index 8d572038b85c..000000000000
--- a/www-client/dillo/files/dillo.png
+++ /dev/null
Binary files differ