| 1 |
pacho 12/02/19 13:20:37 |
| 2 |
|
| 3 |
Modified: pavuk-0.9.36_pre20120215.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix PCRE support (bug #262504#c34 by Richard Grenville), install icon for menu entry. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.46/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: pavuk-0.9.36_pre20120215.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- pavuk-0.9.36_pre20120215.ebuild 17 Feb 2012 08:13:23 -0000 1.2 |
| 23 |
+++ pavuk-0.9.36_pre20120215.ebuild 19 Feb 2012 13:20:37 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild,v 1.2 2012/02/17 08:13:23 pacho Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215.ebuild,v 1.3 2012/02/19 13:20:37 pacho Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -15,10 +15,11 @@ |
| 33 |
LICENSE="GPL-2" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 36 |
-IUSE="debug gtk hammer ipv6 nls profile ssl" |
| 37 |
+IUSE="debug gtk hammer ipv6 nls pcre profile ssl" |
| 38 |
|
| 39 |
RDEPEND="virtual/libintl |
| 40 |
gtk? ( x11-libs/gtk+:2 ) |
| 41 |
+ pcre? ( dev-libs/libpcre ) |
| 42 |
ssl? ( dev-libs/openssl )" |
| 43 |
|
| 44 |
DEPEND="${RDEPEND} |
| 45 |
@@ -31,6 +32,7 @@ |
| 46 |
DOCS=( README CREDITS NEWS AUTHORS BUGS TODO MAILINGLIST wget-pavuk.HOWTO |
| 47 |
ChangeLog wget-pavuk.HOWTO pavuk_authinfo.sample pavukrc.sample |
| 48 |
) |
| 49 |
+ |
| 50 |
src_prepare() { |
| 51 |
# Fixes a bug in Makefile.am that causes aclocal to fail |
| 52 |
sed -i 's/^\(ACLOCAL_AMFLAGS[[:space:]]*=[[:space:]]*-I[[:space:]]*\)\$(top_srcdir)\//\1/' "${S}/Makefile.am" || die |
| 53 |
@@ -38,6 +40,9 @@ |
| 54 |
# Fixes a bug in configure.in that breaks non-debug builds |
| 55 |
sed -i 's/\([[:space:]]C\(PP\)*FLAGS=`\)/true; # \1/' "${S}/configure.in" || die |
| 56 |
|
| 57 |
+ # Fixes a bug in re.c for PCRE support |
| 58 |
+ epatch "${FILESDIR}/${P}-pcre-fix.patch" |
| 59 |
+ |
| 60 |
# Fix for building with ~dev-lang/spidermonkey-1.8.5 |
| 61 |
# sed -i 's/mozjs/mozjs185/g' "${S}/configure.in" || die |
| 62 |
|
| 63 |
@@ -45,11 +50,15 @@ |
| 64 |
} |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
+ local regex="auto" |
| 68 |
+ use pcre && regex="pcre" |
| 69 |
+ |
| 70 |
local myeconfargs=( |
| 71 |
--enable-threads |
| 72 |
--enable-socks |
| 73 |
--enable-utf-8 |
| 74 |
--disable-js |
| 75 |
+ "--with-regex=${regex}" |
| 76 |
$(use_enable gtk) |
| 77 |
$(use_enable gtk gtk2) |
| 78 |
$(use_enable gtk gnome) |
| 79 |
@@ -64,15 +73,6 @@ |
| 80 |
$(use_enable profile profiling) |
| 81 |
) |
| 82 |
|
| 83 |
- # PCRE support: Broken! |
| 84 |
- # ===================== |
| 85 |
- |
| 86 |
- # if use pcre; then |
| 87 |
- # myeconfargs=($myeconfargs --with-regex=pcre) |
| 88 |
- # else |
| 89 |
- myeconfargs+=( "--with-regex=auto" ) |
| 90 |
- # fi |
| 91 |
- |
| 92 |
# JavaScript bindings: Broken! |
| 93 |
# ============================ |
| 94 |
# Currently could pass configure phase with ~dev-lang/spidermonkey-1.8.5 |
| 95 |
@@ -92,7 +92,11 @@ |
| 96 |
} |
| 97 |
|
| 98 |
src_install() { |
| 99 |
- use gtk && domenu "${S}/pavuk.desktop" |
| 100 |
+ if use gtk; then |
| 101 |
+ newicon src/pavuk_logo.xpm pavuk.xpm |
| 102 |
+ domenu pavuk.desktop |
| 103 |
+ fi |
| 104 |
+ |
| 105 |
doman "${S}/doc/pavuk.1" |
| 106 |
|
| 107 |
autotools-utils_src_install |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.37 net-misc/pavuk/ChangeLog |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/ChangeLog?rev=1.37&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/ChangeLog?rev=1.37&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/pavuk/ChangeLog?r1=1.36&r2=1.37 |
| 116 |
|
| 117 |
Index: ChangeLog |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v |
| 120 |
retrieving revision 1.36 |
| 121 |
retrieving revision 1.37 |
| 122 |
diff -u -r1.36 -r1.37 |
| 123 |
--- ChangeLog 17 Feb 2012 08:13:23 -0000 1.36 |
| 124 |
+++ ChangeLog 19 Feb 2012 13:20:37 -0000 1.37 |
| 125 |
@@ -1,6 +1,12 @@ |
| 126 |
# ChangeLog for net-misc/pavuk |
| 127 |
# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 128 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.36 2012/02/17 08:13:23 pacho Exp $ |
| 129 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.37 2012/02/19 13:20:37 pacho Exp $ |
| 130 |
+ |
| 131 |
+ 19 Feb 2012; Pacho Ramos <pacho@g.o> |
| 132 |
+ +files/pavuk-0.9.36_pre20120215-pcre-fix.patch, |
| 133 |
+ pavuk-0.9.36_pre20120215.ebuild: |
| 134 |
+ Fix PCRE support (bug #262504#c34 by Richard Grenville), install icon for menu |
| 135 |
+ entry. |
| 136 |
|
| 137 |
17 Feb 2012; Pacho Ramos <pacho@g.o> metadata.xml, |
| 138 |
pavuk-0.9.36_pre20120215.ebuild: |
Archives