* [gentoo-commits] proj/gnome:master commit in: net-misc/vino/, net-misc/vino/files/
@ 2012-09-30 23:08 Alexandre Rostovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-30 23:08 UTC (permalink / raw
To: gentoo-commits
commit: b8cd75a512f71e50f47dc339d728e54d873c730a
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 22:41:28 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 23:08:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b8cd75a5
net-misc/vino: 3.5.92 → 3.6.0
Update license. Clear up the USE=secret vs. USE=gnome-keyring mixup
pointed out by elxa. (Note that "gnome-keyring" as the USE flag name
still make sense because libsecret is used for accessing implementations
of the Secret Service API - and the only implementation that currently
exists is gnome-keyring.)
---
net-misc/vino/files/vino-3.6.0-secret-deps.patch | 35 ++++++++++++++++++++
.../vino/{vino-3.5.92.ebuild => vino-3.6.0.ebuild} | 13 ++++---
net-misc/vino/vino-9999.ebuild | 7 ++--
3 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/net-misc/vino/files/vino-3.6.0-secret-deps.patch b/net-misc/vino/files/vino-3.6.0-secret-deps.patch
new file mode 100644
index 0000000..9eac4c5
--- /dev/null
+++ b/net-misc/vino/files/vino-3.6.0-secret-deps.patch
@@ -0,0 +1,35 @@
+From 018e757ca2ce432142008f519ff8cb96f12c2659 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 30 Sep 2012 18:50:33 -0400
+Subject: [PATCH] configure: consistently use LIBSECRET_DEPS, not SECRET_DEPS
+
+https://bugzilla.gnome.org/show_bug.cgi?id=685171
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e41c5c8..0306274 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AS_IF([test "x$have_network_manager" = "xyes"],
+ [AC_MSG_ERROR([NetworkManager support requested but not found])])])
+
+ # Check for secret
+-SECRET_DEPS="libsecret-1"
++LIBSECRET_DEPS="libsecret-1"
+
+ AC_ARG_WITH([secret],
+ [AS_HELP_STRING([--without-secret],
+@@ -131,7 +131,7 @@ AS_IF([test "x$with_secret" != "xno"],
+
+ AS_IF([test "x$have_secret" != "xno"],
+ [AC_DEFINE([VINO_HAVE_SECRET], [], [Build with secret support])],
+- [SECRET_DEPS=""
++ [LIBSECRET_DEPS=""
+ AS_IF([test "x$with_secret" = "xyes"],
+ [AC_MSG_ERROR([secret support requested but not found])])])
+
+--
+1.7.12
+
diff --git a/net-misc/vino/vino-3.5.92.ebuild b/net-misc/vino/vino-3.6.0.ebuild
similarity index 87%
rename from net-misc/vino/vino-3.5.92.ebuild
rename to net-misc/vino/vino-3.6.0.ebuild
index a08c637..e2c7439 100644
--- a/net-misc/vino/vino-3.5.92.ebuild
+++ b/net-misc/vino/vino-3.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit autotools eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -14,14 +14,14 @@ fi
DESCRIPTION="An integrated VNC server for GNOME"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="avahi crypt ipv6 jpeg libnotify networkmanager +secret ssl +telepathy +zlib"
+IUSE="avahi crypt gnome-keyring ipv6 jpeg libnotify networkmanager ssl +telepathy +zlib"
# cairo used in vino-fb
# libSM and libICE used in eggsmclient-xsmp
@@ -69,10 +69,9 @@ pkg_setup() {
$(use_with crypt gcrypt)
$(use_enable ipv6)
$(use_with jpeg)
- $(use_with gnome-keyring)
+ $(use_with gnome-keyring secret)
$(use_with libnotify)
$(use_with networkmanager network-manager)
- $(use_with secret)
$(use_with ssl gnutls)
$(use_with telepathy)
$(use_with zlib)"
@@ -80,9 +79,13 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=685171
+ epatch "${FILESDIR}/${P}-secret-deps.patch"
+
# <glib-2.31 compatibility
if [[ ${PV} != 9999 ]]; then
rm -v server/vino-marshal.{c,h} || die
fi
+ eautoreconf
gnome2_src_prepare
}
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index a08c637..9aba716 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-9999.ebuild
@@ -14,14 +14,14 @@ fi
DESCRIPTION="An integrated VNC server for GNOME"
HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="avahi crypt ipv6 jpeg libnotify networkmanager +secret ssl +telepathy +zlib"
+IUSE="avahi crypt gnome-keyring ipv6 jpeg libnotify networkmanager ssl +telepathy +zlib"
# cairo used in vino-fb
# libSM and libICE used in eggsmclient-xsmp
@@ -69,10 +69,9 @@ pkg_setup() {
$(use_with crypt gcrypt)
$(use_enable ipv6)
$(use_with jpeg)
- $(use_with gnome-keyring)
+ $(use_with gnome-keyring secret)
$(use_with libnotify)
$(use_with networkmanager network-manager)
- $(use_with secret)
$(use_with ssl gnutls)
$(use_with telepathy)
$(use_with zlib)"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-misc/vino/, net-misc/vino/files/
@ 2012-10-28 18:10 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-28 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 8d5ccbcb99b6e42d0bc587499abc2a4efd96d963
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 18:02:14 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 18:07:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8d5ccbcb
net-misc/vino: 3.6.0 → 3.6.1
---
net-misc/vino/files/vino-3.6.0-secret-deps.patch | 35 --------------------
.../vino/{vino-3.6.0.ebuild => vino-3.6.1.ebuild} | 12 ++-----
net-misc/vino/vino-9999.ebuild | 6 +--
3 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/net-misc/vino/files/vino-3.6.0-secret-deps.patch b/net-misc/vino/files/vino-3.6.0-secret-deps.patch
deleted file mode 100644
index 9eac4c5..0000000
--- a/net-misc/vino/files/vino-3.6.0-secret-deps.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 018e757ca2ce432142008f519ff8cb96f12c2659 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 30 Sep 2012 18:50:33 -0400
-Subject: [PATCH] configure: consistently use LIBSECRET_DEPS, not SECRET_DEPS
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685171
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e41c5c8..0306274 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,7 +117,7 @@ AS_IF([test "x$have_network_manager" = "xyes"],
- [AC_MSG_ERROR([NetworkManager support requested but not found])])])
-
- # Check for secret
--SECRET_DEPS="libsecret-1"
-+LIBSECRET_DEPS="libsecret-1"
-
- AC_ARG_WITH([secret],
- [AS_HELP_STRING([--without-secret],
-@@ -131,7 +131,7 @@ AS_IF([test "x$with_secret" != "xno"],
-
- AS_IF([test "x$have_secret" != "xno"],
- [AC_DEFINE([VINO_HAVE_SECRET], [], [Build with secret support])],
-- [SECRET_DEPS=""
-+ [LIBSECRET_DEPS=""
- AS_IF([test "x$with_secret" = "xyes"],
- [AC_MSG_ERROR([secret support requested but not found])])])
-
---
-1.7.12
-
diff --git a/net-misc/vino/vino-3.6.0.ebuild b/net-misc/vino/vino-3.6.1.ebuild
similarity index 92%
rename from net-misc/vino/vino-3.6.0.ebuild
rename to net-misc/vino/vino-3.6.1.ebuild
index e2c7439..b76c3df 100644
--- a/net-misc/vino/vino-3.6.0.ebuild
+++ b/net-misc/vino/vino-3.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -60,7 +60,8 @@ DEPEND="${RDEPEND}
# bug #394611; tight encoding requires zlib encoding
REQUIRED_USE="jpeg? ( zlib )"
-pkg_setup() {
+src_prepare() {
+ DOCS="AUTHORS ChangeLog* NEWS README"
G2CONF="${G2CONF}
--disable-schemas-compile
--enable-http-server
@@ -75,17 +76,10 @@ pkg_setup() {
$(use_with ssl gnutls)
$(use_with telepathy)
$(use_with zlib)"
- DOCS="AUTHORS ChangeLog* NEWS README"
-}
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=685171
- epatch "${FILESDIR}/${P}-secret-deps.patch"
# <glib-2.31 compatibility
if [[ ${PV} != 9999 ]]; then
rm -v server/vino-marshal.{c,h} || die
fi
- eautoreconf
gnome2_src_prepare
}
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index 9aba716..b76c3df 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-9999.ebuild
@@ -60,7 +60,8 @@ DEPEND="${RDEPEND}
# bug #394611; tight encoding requires zlib encoding
REQUIRED_USE="jpeg? ( zlib )"
-pkg_setup() {
+src_prepare() {
+ DOCS="AUTHORS ChangeLog* NEWS README"
G2CONF="${G2CONF}
--disable-schemas-compile
--enable-http-server
@@ -75,10 +76,7 @@ pkg_setup() {
$(use_with ssl gnutls)
$(use_with telepathy)
$(use_with zlib)"
- DOCS="AUTHORS ChangeLog* NEWS README"
-}
-src_prepare() {
# <glib-2.31 compatibility
if [[ ${PV} != 9999 ]]; then
rm -v server/vino-marshal.{c,h} || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-28 18:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-30 23:08 [gentoo-commits] proj/gnome:master commit in: net-misc/vino/, net-misc/vino/files/ Alexandre Rostovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-10-28 18:10 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox