summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-09-16 00:15:03 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-09-16 00:15:03 +0000
commit24aadc6173a5f32d4f7cc8a7da4fb515f101824f (patch)
treecdac3be6a2c9bab848d23f8a9ed2e501305f2f19 /net-libs
parentDrop PaX patch as it doesn't seem to be needed anymore #431810. (diff)
downloadhistorical-24aadc6173a5f32d4f7cc8a7da4fb515f101824f.tar.gz
historical-24aadc6173a5f32d4f7cc8a7da4fb515f101824f.tar.bz2
historical-24aadc6173a5f32d4f7cc8a7da4fb515f101824f.zip
Fix vala.eclass usage (bug #435158, thanks to Alexandre and Rafał Mużyło) and simplify dependencies.
Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/telepathy-glib/ChangeLog7
-rw-r--r--net-libs/telepathy-glib/Manifest14
-rw-r--r--net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild13
3 files changed, 19 insertions, 15 deletions
diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index 5c4623af3b75..fc8f9592502c 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-libs/telepathy-glib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.115 2012/09/15 08:53:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.116 2012/09/16 00:15:03 tetromino Exp $
+
+ 16 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ telepathy-glib-0.18.2.ebuild:
+ Fix vala.eclass usage (bug #435158, thanks to Alexandre and Rafał Mużyło)
+ and simplify dependencies.
*telepathy-glib-0.18.2 (15 Sep 2012)
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index c40c3c0556d4..0323c3fade05 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -6,13 +6,17 @@ DIST telepathy-glib-0.18.1.tar.gz 3537671 SHA256 3738256689e34c22ddf9c4eb33f44ce
DIST telepathy-glib-0.18.2.tar.gz 3539165 SHA256 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f SHA512 3f3d805c8c683596e92d60907dead975e378363d13a2c5b073e068809be24f0a07f433d952cf92a95fa29ced259b06334d69cad006d859f7c1f7bcc63added4d WHIRLPOOL 9f3ee0464e945f879917d0a490fe4e11073ab431835b1b5eb643a0ab8440bddfcabe0f7118b9b2574d7ca6f7de90c9066ec82f9e37e5d1376784f2fc9981879f
EBUILD telepathy-glib-0.16.5.ebuild 1608 SHA256 22000423c0db9f10ade8aa510e9e34c2547e7d74485a713ff7a7bf863193a448 SHA512 2d9bc92fa38f9e86c3f761421f48399189a5efecb09b3e9e09947a7a9a2ec9c42003c82b72946f7e174612716b17ed9aefc3058de0498d3f49e9a632ab56a47a WHIRLPOOL a0233b5cbfc26d0138915d6dfc826bdded8c30d11f69148e74c3eee833c14d323c6edec96723fa3c34ce2c5d89f522e17b102bc3826a177dcadb08d8c6fbc935
EBUILD telepathy-glib-0.18.1.ebuild 1618 SHA256 026ff8fb1bcda715e22ee965528d530bd73e10d9ed3d4c25bfbbf252dc484180 SHA512 3a29560044373f25fe5f4e37099fc31283f6bfa925a97177060307525690a211f56900e94c3f22f072f21f6e56549f864d26d09504264575bdc5097aa34dc69c WHIRLPOOL 6993c1cdbd9405a84ddcc54e491c8c43a920c2b97316c74dfc735f503fb98d36ff425527411782db318c3b5a797adbdfe1cdef8aa71eb30f737f0985034463c1
-EBUILD telepathy-glib-0.18.2.ebuild 1650 SHA256 1934128c6bd90507ecd23a0f030f99d541eb32aa31c2bf6ca74d233a44345c03 SHA512 c4b2610450042cc7ffd3dec2ed966e3e55d17bc6badb09d9eba5f8a6d64bd0cacbbbb05fbd13f8cce49d033d14481b2a50cd8def2f6acc8b676098c8e187a0a8 WHIRLPOOL 5e22c2321dba4cd73d2ca28611f04dbb185408150426460aace434c611fc451ed26a70119b03ca6f77ac6ea3bb0f0aaff4b9d91b4169140809a5243dc3fa19c1
-MISC ChangeLog 18159 SHA256 f90fbc13516824b6dc2d234e729194ca0cf6189a363fb2092d575835c1412917 SHA512 a7b84ea61904a1ae7e7c04d2eb4e2e08cd2b307bdbbf74474da39fdd8d74f7bb1a899c2453d1ef20bfc2ddbc52d00adcf2115fcfef0b4a12a26fdbc6257dac72 WHIRLPOOL f3cd1f547b9f64c10a1860e61fd2bb70ca0f3ba2bc04d5cd9785f164d09c62057611e36c50501cb82a31d9539a9364458b120265b6fa1e6faeb184b81ec85427
+EBUILD telepathy-glib-0.18.2.ebuild 1559 SHA256 485f530a4ae44eeaf9f646e17cff0ff02301bf02b3d5e4671ba0ec35b95cc6c9 SHA512 65c2deb3b5c1df4a2ff9b5732c7f2e2b52006f4713e90fddfbf3b9ff056c8137b8242a0cd2c547b7a6df200f0ce6659f5efb569ac5b04181efa9b4b17a4ce71f WHIRLPOOL 1a7074b5a9d7455a5c796044b33eb49caf7ebd4e64cd32b584f504c01160f3227b14d83eaab3b4b6ff8650c6986cc4d03457cdb11adbf73ad23b5e7d8fbbe05d
+MISC ChangeLog 18363 SHA256 ac59375b0d55cbdd241616dde462ec784831a5a1f21fbb53c1250b04916b082f SHA512 37e01d538f46891c691511ecbf4532c80fc7a1c8096bec9abcd519affc7dadfeda6d69adf1e0f694c139316cf1fc3923a1101b06874935bf17c2a8134de8d3e5 WHIRLPOOL 1cfaef00f18ca4d10a2f0bf22d8627c11ccd78bd9653703c8f3a6a8b0e33f72cb58b2d3498422252e90c7d89a693fe61f49097b99979536cd798968ed2ac1090
MISC metadata.xml 514 SHA256 490f0833fb21d4e784b15e8b2a090c7d487badc59ca7bef13cd2912a39b9118a SHA512 40b99f0c10ac293b2615bed0b8e50bffc45119589c7b1eaf1435e3fb2281702b4c2d8129c8d4c1ab10cf28c19a824b4718bd25857df7bb85e6093c1797f5acd2 WHIRLPOOL 4cc09e699c3c432323c0ce74e5f68bc22dfca2e1247d12eedcb4d8489707e735b0a87a790b780f28f2ab96033c0b1a7a06950159561631039efbd88f53429ef3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlBUQiQACgkQCaWpQKGI+9TkCQCfcqc7YR/lW5CoNW7sREQY1kzp
-ycMAnj1rzssE6tmKKeIFwLLY+PKpKyzB
-=7F7z
+iQEcBAEBCAAGBQJQVRoNAAoJEJ0WA1zPCt1hl+4H/1ssjlwg3ds2ClY6nz+CZzyS
+MPxkZQXXSuSIxgkDpLFns4WSSgTCsDIrIkRXWUCzKhrQK4qhm4mQ+GSDQV5K/14V
+GGkRxYnG1uR8A83Qjif7PZYHY3DfH/+aeTXbhXJC7uLBYi4AVJnY3uAxlw2NJqsj
+9rw8KxqBulnSEs27pgbnHxpMLmjViiYGJVT02ihjhQ+ZraFl+s98Fs04lilE0RN0
+xYHFp0RYjCLUHOaDklgmfhrsu+smEkg2WlYQiM5ToWBwd760J5I5rCNEHXdbYU1l
+wVaKb/J/QBtA0FE2GLH7yG9bHevuWiFtX7l8xPXc4MpDGRFRhMHffOhfcOhCnU0=
+=9g85
-----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
index 138aa40ccdf6..0c32bfcf6180 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild,v 1.1 2012/09/15 08:53:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.18.2.ebuild,v 1.2 2012/09/16 00:15:03 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="2:2.5"
@@ -17,6 +17,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
RDEPEND=">=dev-libs/glib-2.30.0:2
>=dev-libs/dbus-glib-0.90
@@ -24,23 +25,17 @@ RDEPEND=">=dev-libs/glib-2.30.0:2
DEPEND="${RDEPEND}
dev-libs/libxslt
virtual/pkgconfig
- vala? ( $(vala_depend)
- >=dev-libs/gobject-introspection-1.30 )"
+ vala? ( $(vala_depend) )"
src_prepare() {
python_convert_shebangs -r 2 examples tests tools
+ use vala && vala_src_prepare
default_src_prepare
}
src_configure() {
local myconf
- if use vala; then
- myconf="--enable-introspection
- VALAC=$(type -p valac-0.16)
- VAPIGEN=$(type -p vapigen-0.16)"
- fi
-
econf --disable-static \
--disable-installed-tests \
PYTHON=$(PYTHON -2 -a) \