| 1 |
armin76 08/05/29 19:34:41 |
| 2 |
|
| 3 |
Modified: ChangeLog dnsmasq-2.40.ebuild dnsmasq-2.39.ebuild |
| 4 |
Log: |
| 5 |
Fix depend on openresolv, since resolvconf-gentoo is masked |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.152 net-dns/dnsmasq/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.152&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.152&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.151&r2=1.152 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v |
| 18 |
retrieving revision 1.151 |
| 19 |
retrieving revision 1.152 |
| 20 |
diff -u -r1.151 -r1.152 |
| 21 |
--- ChangeLog 10 Apr 2008 21:03:56 -0000 1.151 |
| 22 |
+++ ChangeLog 29 May 2008 19:34:40 -0000 1.152 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-dns/dnsmasq |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.151 2008/04/10 21:03:56 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.152 2008/05/29 19:34:40 armin76 Exp $ |
| 28 |
+ |
| 29 |
+ 29 May 2008; Raúl Porcel <armin76@g.o> dnsmasq-2.39.ebuild, |
| 30 |
+ dnsmasq-2.40.ebuild: |
| 31 |
+ Fix depend on openresolv, since resolvconf-gentoo is masked |
| 32 |
|
| 33 |
10 Apr 2008; Mike Frysinger <vapier@g.o> dnsmasq-2.41.ebuild: |
| 34 |
Mark amd64 stable #216099. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.9 net-dns/dnsmasq/dnsmasq-2.40.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild?rev=1.9&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild?rev=1.9&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild?r1=1.8&r2=1.9 |
| 43 |
|
| 44 |
Index: dnsmasq-2.40.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild,v |
| 47 |
retrieving revision 1.8 |
| 48 |
retrieving revision 1.9 |
| 49 |
diff -u -r1.8 -r1.9 |
| 50 |
--- dnsmasq-2.40.ebuild 21 Feb 2008 15:54:02 -0000 1.8 |
| 51 |
+++ dnsmasq-2.40.ebuild 29 May 2008 19:34:40 -0000 1.9 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild,v 1.8 2008/02/21 15:54:02 chutzpah Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild,v 1.9 2008/05/29 19:34:40 armin76 Exp $ |
| 57 |
|
| 58 |
inherit eutils toolchain-funcs flag-o-matic |
| 59 |
|
| 60 |
@@ -18,7 +18,7 @@ |
| 61 |
RDEPEND="" |
| 62 |
DEPEND="${RDEPEND} |
| 63 |
dbus? ( sys-apps/dbus ) |
| 64 |
- resolvconf? ( net-dns/resolvconf-gentoo )" |
| 65 |
+ resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )" |
| 66 |
|
| 67 |
S=${WORKDIR}/${PN}-${MY_PV} |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.13 net-dns/dnsmasq/dnsmasq-2.39.ebuild |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild?rev=1.13&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild?rev=1.13&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild?r1=1.12&r2=1.13 |
| 77 |
|
| 78 |
Index: dnsmasq-2.39.ebuild |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild,v |
| 81 |
retrieving revision 1.12 |
| 82 |
retrieving revision 1.13 |
| 83 |
diff -u -r1.12 -r1.13 |
| 84 |
--- dnsmasq-2.39.ebuild 21 Feb 2008 15:54:02 -0000 1.12 |
| 85 |
+++ dnsmasq-2.39.ebuild 29 May 2008 19:34:40 -0000 1.13 |
| 86 |
@@ -1,6 +1,6 @@ |
| 87 |
# Copyright 1999-2008 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild,v 1.12 2008/02/21 15:54:02 chutzpah Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild,v 1.13 2008/05/29 19:34:40 armin76 Exp $ |
| 91 |
|
| 92 |
inherit eutils toolchain-funcs flag-o-matic |
| 93 |
|
| 94 |
@@ -18,7 +18,7 @@ |
| 95 |
RDEPEND="" |
| 96 |
DEPEND="${RDEPEND} |
| 97 |
dbus? ( sys-apps/dbus ) |
| 98 |
- resolvconf? ( net-dns/resolvconf-gentoo )" |
| 99 |
+ resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )" |
| 100 |
|
| 101 |
S=${WORKDIR}/${PN}-${MY_PV} |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
-- |
| 107 |
gentoo-commits@l.g.o mailing list |
Archives