* [gentoo-commits] gentoo-x86 commit in www-client/uzbl: uzbl-2011.02.15.ebuild ChangeLog uzbl-9999.ebuild
@ 2011-02-15 21:20 Alex Alexander (wired)
0 siblings, 0 replies; 2+ messages in thread
From: Alex Alexander (wired) @ 2011-02-15 21:20 UTC (permalink / raw
To: gentoo-commits
wired 11/02/15 21:20:19
Modified: ChangeLog uzbl-9999.ebuild
Added: uzbl-2011.02.15.ebuild
Log:
version bump, bug #355093
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Revision Changes Path
1.36 www-client/uzbl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?r1=1.35&r2=1.36
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 5 Dec 2010 22:26:37 -0000 1.35
+++ ChangeLog 15 Feb 2011 21:20:19 -0000 1.36
@@ -1,6 +1,12 @@
# ChangeLog for www-client/uzbl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.35 2010/12/05 22:26:37 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.36 2011/02/15 21:20:19 wired Exp $
+
+*uzbl-2011.02.15 (15 Feb 2011)
+
+ 15 Feb 2011; Alex Alexander <wired@gentoo.org> +uzbl-2011.02.15.ebuild,
+ uzbl-9999.ebuild:
+ version bump, bug #355093
*uzbl-2010.11.25 (05 Dec 2010)
1.18 www-client/uzbl/uzbl-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?r1=1.17&r2=1.18
Index: uzbl-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- uzbl-9999.ebuild 5 Dec 2010 22:26:37 -0000 1.17
+++ uzbl-9999.ebuild 15 Feb 2011 21:20:19 -0000 1.18
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.17 2010/12/05 22:26:37 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.18 2011/02/15 21:20:19 wired Exp $
-EAPI="2"
+EAPI="4"
inherit base
@@ -28,6 +28,8 @@
SLOT="0"
IUSE+=" +browser helpers +tabbed vim-syntax"
+REQUIRED_USE="tabbed? ( browser )"
+
COMMON_DEPEND="
dev-libs/glib:2
>=dev-libs/icu-4.0.1
@@ -79,36 +81,25 @@
einfo "You have enabled the *helpers* USE flag that installs"
einfo "various optional applications used by uzbl's extra scripts."
fi
+}
- if use tabbed && ! use browser; then
- ewarn
- ewarn "You enabled the *tabbed* USE flag but not *browser*."
- ewarn "*tabbed* depends on *browser*, so it will be disabled."
- ewarn
- ebeep 3
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git_src_unpack
+ else
+ unpack "${A}"
+ mv Dieterbe-uzbl-* "${S}"
fi
}
src_prepare() {
if [[ ${PV} == *9999* ]]; then
git_src_prepare
- else
- cd "${WORKDIR}"/Dieterbe-uzbl-*
- S=$(pwd)
fi
# remove -ggdb
sed -i "s/-ggdb //g" Makefile ||
die "-ggdb removal sed failed"
-
- # adjust path in default config file to /usr/share
- sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
- examples/config/config ||
- die "config path sed failed"
-}
-
-src_compile() {
- emake || die "compile failed"
}
src_install() {
1.1 www-client/uzbl/uzbl-2011.02.15.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild?rev=1.1&content-type=text/plain
Index: uzbl-2011.02.15.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v 1.1 2011/02/15 21:20:19 wired Exp $
EAPI="4"
inherit base
IUSE=""
if [[ ${PV} == *9999* ]]; then
inherit git
EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/Dieterbe/uzbl.git"}
KEYWORDS=""
SRC_URI=""
IUSE="experimental"
use experimental &&
EGIT_BRANCH="experimental" &&
EGIT_COMMIT="experimental"
else
KEYWORDS="~amd64 ~x86"
SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${PV} -> ${P}.tar.gz"
fi
DESCRIPTION="Web interface tools which adhere to the unix philosophy."
HOMEPAGE="http://www.uzbl.org"
LICENSE="LGPL-2.1 MPL-1.1"
SLOT="0"
IUSE+=" +browser helpers +tabbed vim-syntax"
REQUIRED_USE="tabbed? ( browser )"
COMMON_DEPEND="
dev-libs/glib:2
>=dev-libs/icu-4.0.1
>=net-libs/libsoup-2.24
>=net-libs/webkit-gtk-1.1.15
>=x11-libs/gtk+-2.14
"
DEPEND="
>=dev-util/pkgconfig-0.19
${COMMON_DEPEND}
"
RDEPEND="
${COMMON_DEPEND}
x11-misc/xdg-utils
browser? (
x11-misc/xclip
)
helpers? (
dev-python/pygtk
dev-python/pygobject
gnome-extra/zenity
net-misc/socat
x11-libs/pango
x11-misc/dmenu
x11-misc/xclip
)
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
# TODO document what requires the above helpers
pkg_setup() {
if ! use helpers; then
elog "uzbl's extra scripts use various optional applications:"
elog
elog " dev-python/pygtk"
elog " dev-python/pygobject"
elog " gnome-extra/zenity"
elog " net-misc/socat"
elog " x11-libs/pango"
elog " x11-misc/dmenu"
elog " x11-misc/xclip"
elog
elog "Make sure you emerge the ones you need manually."
elog "You may also activate the *helpers* USE flag to"
elog "install all of them automatically."
else
einfo "You have enabled the *helpers* USE flag that installs"
einfo "various optional applications used by uzbl's extra scripts."
fi
}
src_unpack() {
if [[ ${PV} == *9999* ]]; then
git_src_unpack
else
unpack "${A}"
mv Dieterbe-uzbl-* "${S}"
fi
}
src_prepare() {
if [[ ${PV} == *9999* ]]; then
git_src_prepare
fi
# remove -ggdb
sed -i "s/-ggdb //g" Makefile ||
die "-ggdb removal sed failed"
}
src_install() {
local targets="install-uzbl-core"
use browser && targets="${targets} install-uzbl-browser"
use browser && use tabbed && targets="${targets} install-uzbl-tabbed"
emake DESTDIR="${D}" PREFIX="/usr" DOCDIR="${D}/usr/share/doc/${PF}" ${targets} ||
die "Installation failed"
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/ftdetect
doins "${S}"/extras/vim/ftdetect/uzbl.vim || die "vim-syntax doins failed"
insinto /usr/share/vim/vimfiles/syntax
doins "${S}"/extras/vim/syntax/uzbl.vim || die "vim-syntax doins failed"
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-client/uzbl: uzbl-2011.02.15.ebuild ChangeLog uzbl-9999.ebuild
@ 2011-02-15 21:29 Alex Alexander (wired)
0 siblings, 0 replies; 2+ messages in thread
From: Alex Alexander (wired) @ 2011-02-15 21:29 UTC (permalink / raw
To: gentoo-commits
wired 11/02/15 21:29:09
Modified: uzbl-2011.02.15.ebuild ChangeLog uzbl-9999.ebuild
Log:
added warning, removed unnecessary quotes
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Revision Changes Path
1.2 www-client/uzbl/uzbl-2011.02.15.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild?r1=1.1&r2=1.2
Index: uzbl-2011.02.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uzbl-2011.02.15.ebuild 15 Feb 2011 21:20:19 -0000 1.1
+++ uzbl-2011.02.15.ebuild 15 Feb 2011 21:29:09 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v 1.1 2011/02/15 21:20:19 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-2011.02.15.ebuild,v 1.2 2011/02/15 21:29:09 wired Exp $
EAPI="4"
@@ -81,13 +81,17 @@
einfo "You have enabled the *helpers* USE flag that installs"
einfo "various optional applications used by uzbl's extra scripts."
fi
+ ewarn
+ ewarn "This version introduces some backwards-incompatible changes."
+ ewarn "Please read http://www.uzbl.org/news.php?id=32 for more details."
+ ewarn
}
src_unpack() {
if [[ ${PV} == *9999* ]]; then
git_src_unpack
else
- unpack "${A}"
+ unpack ${A}
mv Dieterbe-uzbl-* "${S}"
fi
}
1.37 www-client/uzbl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/ChangeLog?r1=1.36&r2=1.37
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 15 Feb 2011 21:20:19 -0000 1.36
+++ ChangeLog 15 Feb 2011 21:29:09 -0000 1.37
@@ -1,6 +1,10 @@
# ChangeLog for www-client/uzbl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.36 2011/02/15 21:20:19 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.37 2011/02/15 21:29:09 wired Exp $
+
+ 15 Feb 2011; Alex Alexander <wired@gentoo.org> uzbl-2011.02.15.ebuild,
+ uzbl-9999.ebuild:
+ added warning, removed unnecessary quotes
*uzbl-2011.02.15 (15 Feb 2011)
1.19 www-client/uzbl/uzbl-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild?r1=1.18&r2=1.19
Index: uzbl-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- uzbl-9999.ebuild 15 Feb 2011 21:20:19 -0000 1.18
+++ uzbl-9999.ebuild 15 Feb 2011 21:29:09 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.18 2011/02/15 21:20:19 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.19 2011/02/15 21:29:09 wired Exp $
EAPI="4"
@@ -87,7 +87,7 @@
if [[ ${PV} == *9999* ]]; then
git_src_unpack
else
- unpack "${A}"
+ unpack ${A}
mv Dieterbe-uzbl-* "${S}"
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-15 21:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-15 21:20 [gentoo-commits] gentoo-x86 commit in www-client/uzbl: uzbl-2011.02.15.ebuild ChangeLog uzbl-9999.ebuild Alex Alexander (wired)
-- strict thread matches above, loose matches on Subject: below --
2011-02-15 21:29 Alex Alexander (wired)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox