summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/vala/ChangeLog6
-rw-r--r--dev-lang/vala/Manifest20
-rw-r--r--dev-lang/vala/vala-0.10.4-r2.ebuild8
-rw-r--r--dev-lang/vala/vala-0.12.1-r1.ebuild5
4 files changed, 25 insertions, 14 deletions
diff --git a/dev-lang/vala/ChangeLog b/dev-lang/vala/ChangeLog
index 800ce8e59a9e..178198a87c3a 100644
--- a/dev-lang/vala/ChangeLog
+++ b/dev-lang/vala/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/vala
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.114 2012/08/20 18:39:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.115 2012/08/23 15:25:46 tetromino Exp $
+
+ 23 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ vala-0.10.4-r2.ebuild, vala-0.12.1-r1.ebuild:
+ Fix file collision with vala-common (bug #432456, thanks to Travis Hansen).
*vala-0.17.5 (20 Aug 2012)
*vala-0.16.1-r2 (20 Aug 2012)
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 418990363b79..19ad492cbb6f 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -10,8 +10,8 @@ DIST vala-0.16.0.tar.xz 2686716 SHA256 3adb37aa2b35e2e2daed47552e85dbcbf752c0f77
DIST vala-0.16.1.tar.xz 2636952 SHA256 8be28ff6347feecb391220ceb4e2209d32b697278e87ed7fc6c9fb1e9345e0d8 SHA512 caf4a58a72b146611e59c7a65f8b0fba9412002a3aa3039ef20f47b05a527da7d46f3eafa24ff6b8e8ac0ce48b72e6b038135106aad4519df8a88c26351c0987 WHIRLPOOL ce99be65e8749cc53c17bc25d5344e1572474d77c0118347759f7de960ec438a99421f040ba17e6b040fb5bd937e1b235f85401b05153db367f4cb6072f47a58
DIST vala-0.17.5.tar.xz 2532576 SHA256 b77f856074c13815bd4274745e6da84b7d3cc75523fe5f71cbef29c9e8e20089 SHA512 b75e72cb3e5c091e37be337e68506e134fbcf233a4fcf456c52b725bc8c88965b66862397de45d9708f3fedc93d3c9ce8758f3370a64dce66c6d9ee45d1b6aec WHIRLPOOL 04bfcfd07fc66df36de8c87b719b9e2a92c16cc38db562e310584c051bd1de848d9a7ad2b69ecc513b7071d6844b4b8931f60f6c803f6980f7a00314741ad95c
EBUILD vala-0.10.4-r1.ebuild 1321 SHA256 1d681b305ebbfddfe5217eb936765f8fb1f2062258a67c3ee1feb34367b56059 SHA512 e9d1721985c02b4116b72565210012c273e1e0c9cfa66282bf5f8e1f53a74426cd5fa8d4028741fcb6c5f720a25dbae87d81a12f6e4fe68df8042133873cde7e WHIRLPOOL 93327cbefe0ccdd17dc1f37fe941bf02b6507345e0ca424649885ef9f868d262c4fd0c8a85666c853e4bd40eb476b712f3b01eb11102a9255bf59e1861d6b401
-EBUILD vala-0.10.4-r2.ebuild 935 SHA256 2f5910138c71658f5a152daf6e7ddfd0edd0da0ce05a443f88b66b02037014f3 SHA512 440bc62b283f37ee83a8b5659491072d4890f9a1fedbfc29d5856b6c5eb74e399b2d50121cb8aa2f6da0712976b48495c878d03f457512a616599e58c80b298c WHIRLPOOL 8aa4ae3ac5dd795bce553bd901ab54cc25e7cc7f1f36a2e36938c04e5a93546c02bea6acc7977b0735a418f9473a3290358cbedeaeb80b3257c28638b1a75ba7
-EBUILD vala-0.12.1-r1.ebuild 998 SHA256 91c30034276dac9e302bd25f246c121a6d6c6c4d5dc16cc6cc2e038989e2659d SHA512 2a29fb66d5117be1dbb60a788d9b4c1ac6dffd3197e651666c858255d5d4fe8ce0241935b376e469c089c2bf382c3dd88884269d6bd0ad49fe899c39c231a2a4 WHIRLPOOL ec79046fdca2d44ddb2c024a9833e2c1e580706587d0674510e942bee8472bcc3e50321611e6029817a6e16485076c667e49bb08ca5a372a55e25ba356a9cd6f
+EBUILD vala-0.10.4-r2.ebuild 1087 SHA256 ac6c7dd775a345bc8b4e3d49830ad197bd2e4f02a50eba1796040a916ebc4a95 SHA512 b57fb3c0b2fbfbd527359cd47b39c7ada83bb89d5552d0355042e967de1f57c8e639d2a01222cde807c7a3b0607be74eb2c92f146b500cd88fe470137b7ca2c6 WHIRLPOOL 89b57dbe63e597e9dbfc9b8908f0c7a5fb4d22efad0cfe6e1e2805bfb110e1debd3fdfc652581796936bfb2c59c9a4491d41e9983ccfae3a4bb305b084955123
+EBUILD vala-0.12.1-r1.ebuild 1071 SHA256 241040d5a7ef16f2f0397bf55c5dd030dde6c11df4485f6a1737a7cb37f8997b SHA512 7a734188fdee2336cfc5855744765cac3d2e9344d691656df960c858a35c3289af81d6b4e96506f82fc332b03547e257c0635d1a2ddda50adbf01424ce471e55 WHIRLPOOL 85ce8d2abd224233227e396fc024cfc5abc6d42028de2130a087a1a0ecfeebad8769b8edec45f11cf69076e37d156741398bbded7d26cd968e14babad23ad83c
EBUILD vala-0.12.1.ebuild 1284 SHA256 abfb7fabf083c04551dec9ecd68ebf00e080a561d28a4f4c08c95c0717210185 SHA512 210adc3fe1757b509d11d6e3dd1286a8db88d260a7bf1d4eeca6e7aff25098c52500fb5f1beae739266524d4c2deb94e4ee57c50c749aab42ed9998941455db5 WHIRLPOOL ac39fdc694a042bb13586e28679df7fa36b0d8abe5b6841ad9bd0ea83aaac08ef80317ab473c506b1fa6524e78c14e1fc670606caac8554065c16e2e7355a33d
EBUILD vala-0.14.1.ebuild 1294 SHA256 f32db0df3647280b75bac726f7011863b58539a40ad3203dcd3fd6966016af27 SHA512 9ca0ad571a8fe910affd3088d6cb5514d23345316cfc4b3c1d0b008fa748354cc7969f1c06f255afe6351e9d2dc98ba5dcad1244178dddcb16a3d0ece7a0ae53 WHIRLPOOL e7f2315804ea436c5d3071c4bae9b210c8c0c85a79abd54320f1dd6ee48be3713e88357b5dd72343cf308c0dc3681425d23c49420b68a0f01e8c20c4779d610a
EBUILD vala-0.14.2-r1.ebuild 1513 SHA256 962f7be196f1b9bd10cdc3f8c23adafc11ae3e1be1433a48ccd837eb1cd6d579 SHA512 07d510df14fa83a4b358b0647e3c5fb1b92b548523d18edc1cf329cc5fb08f8fb09fc2fd775c2bb8eec4a0dcfcd0d3251e81c2cfa11c001f24dbe2ff29656475 WHIRLPOOL 300ee90aa6b438757e2c9ecdcb0514131cfe56b8beaaca90617f0cca2cb6d50fa71f3f946529dadd1621291007c008d101d188aa63da65411e540cb64a45c823
@@ -21,16 +21,16 @@ EBUILD vala-0.16.0.ebuild 1253 SHA256 eae02f2c4d99b6c88e4b211a07628f69871feb90cd
EBUILD vala-0.16.1-r1.ebuild 1610 SHA256 960ad4b82f4c6de904c31a5695094ce62ad398d14220d4b11daf08822baabbdb SHA512 750972681387f7cc27a8e36832cd52b24386ae78332cadf267bc3084d25a9e229ba2249b976a9fa3c4f88d1467ef909a9992faa57399d2fc3b7eeff941400cef WHIRLPOOL 9f9dd240fb2553177788a8e9fa9bd199a553b39cc1a81deaedb32f3ff2328bf81ec3e0c1ebe33fb84c0bb5cf31fc090524cf505d8b72dffc1fee793e7c2deb34
EBUILD vala-0.16.1-r2.ebuild 947 SHA256 7046941122b63633d1e59ebfae32ffd182a0e740e23a9f4562426a7e166f52c5 SHA512 577118b94ef2e703e1a5729bfcc9a28bbedd3890f37a7c2b5ac25539d67e2c7b2c4a55be196aa8626923e095f8c7af8b187b1032355007dc943e8ca2b1f3239f WHIRLPOOL 5621c1d8bb99be50a81787562665f087bf6bac3d60774b95fd8bd2aaee9bd1b8d241652b9e0b66119afe48264392effc5d61b902fd0161c8a652dc51e25a13a5
EBUILD vala-0.17.5.ebuild 944 SHA256 d1496b3fecc78f27f1d7da18983c33ea6098536cb1aa7fa08b3c1c4fac8a3524 SHA512 c301b1ef0894af9181a1355d2b7d108a4ec15e3419369f45859de40347ea68e6b9cd706df7efeadaa38a15cbabbedc069c1ad0a3880da50d52afc6e9daa18b94 WHIRLPOOL 2573bf3c3202bd7fbdd1d4011f86996226d9902439ab98ffcc3c47bfea783ba1d0995624f57d6408bf04d6d9f60dfd0a7cfe41b8028b0a9a7331922b4170baac
-MISC ChangeLog 16859 SHA256 339cc8784b56ddff009b553c97c28a1768f76744be1d72bcef3921eeb3122b0a SHA512 041c29ee7c8acd4fac1535252eb3fe5efb3171c312745a797a5812822e5fc9a7b1029fd996baa07a9c57cd5574b7f080f626a5741fe7de3e6512abdf8108f132 WHIRLPOOL 95e7e0b85a3f385f54eb4856302ef7aaba32808dafcb0cd2956782be19b52c457f07f65c14e11d132b9f5ee3fbcf063a3ad9d893dd3dbf31e4073f75cb461bf9
+MISC ChangeLog 17045 SHA256 a2476a8fd6044a6ffa1de4c877def7882e1e7912f4724d9903dd4455874767c7 SHA512 8d70802d5f307a71e1e3ce5308b9b3972c931a471f3cf9f1690c05fa5fb86b39f3a43687f36333b3717b38798c8994467f5fd6d6c4c01ced2887e9d986c6860e WHIRLPOOL 9568f53894657d976eca95c2a2806a326d278b0c228a5c36bb00d9df2ccaa0b8de6d48e2cb318cb3f6ab2f1d26733cb9a80cf97cbae4b82ef47be7e7e42b9a48
MISC metadata.xml 246 SHA256 98f5590ad1f7d7d67baf30bb9c20e3e664b9fa811feb66daafc073351873449f SHA512 9531e7da41b9fccc3022c3151c745e488e2a83a4c10559f40400ef906cf4c67f9538ce35e00c414b92e180c22fb5d3c46cf0b3839a35c0ab45513e71a3bd40e3 WHIRLPOOL a1d6491f564e766abc3ea0da3aba6708d462235a5c422206691f234b23253da486bbc9434c542de7324d2e151bf45f6ef06df92888f7aa7a6d0a93f2f8259af6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQMoSDAAoJEJ0WA1zPCt1hBZoH/3Bw6oump279QqVfeQJSc7zB
-5tpWR09QgYz0lRlNGhEdPsFflIFDPnrsb0E5l2NSSKUWeQt6y1k6TJ9jxnNpbFt6
-36tBcnvVdVcNePEP3YKAZKmaNiDPQZc2EwWtBIneQCYYEax5BLTdK+Hijsvl1s5J
-obqZZtEqAfINaPFxxSsG1is1Me27aoBgAfDSU5MDeNZZBolrvFGN3m1tVOpsqvzL
-5Zv+LB00WXyVE3b022JuNUKxfe54PLzqNSK3lcLDZtITmET4mHuwwijU1iYihTZl
-0JBwzwo4nn5gHcKefhBWlAbk8iquBjdgrhAcH3iQBz7Kh0BfupWYmlAzZD5f4V4=
-=JLaI
+iQEcBAEBCAAGBQJQNkuAAAoJEJ0WA1zPCt1huvQH/j6iYWlr2fIbHTgcxeXAiKs1
+6O6lWETSq65wgyZcIsC1ZW6aBsvdqOhuxSV/m6qJIW/Bj8UFyaM0UV6+ohkGg+D9
+wHNmglpxq6Q3Ph7CKbgQl7j9qxx708t2GB0Y75N0otfwGpWPT/NC5VwZJH6TQXwc
+nrR2j/wM+ZT6AVZDBTnlJlU3+uOcFrlGt/7E75w/X4Gk7qcLZTrdsqF11LOdUgqA
+sbFqVxa4Jgrzc/rWQq00LnOfbqKDd8XyYyzYeWeCl1TiBroKT/BeNAUykaC9xi9/
+499Hcv8M+DJ4LI4TlaOcuRdN+Q/yK2RaQk3pff6lsoNoyU921HH2T/kK/obH+kg=
+=P/X0
-----END PGP SIGNATURE-----
diff --git a/dev-lang/vala/vala-0.10.4-r2.ebuild b/dev-lang/vala/vala-0.10.4-r2.ebuild
index c57c3b997ad1..f7a7cb432cd7 100644
--- a/dev-lang/vala/vala-0.10.4-r2.ebuild
+++ b/dev-lang/vala/vala-0.10.4-r2.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/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.1 2012/08/20 18:39:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.2 2012/08/23 15:25:46 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -35,3 +35,9 @@ pkg_setup() {
$(use_enable vapigen)"
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
}
+
+src_install() {
+ gnome2_src_install
+ rm -v "${ED}usr/share/aclocal/vala.m4" || die "rm failed"
+ rmdir "${ED}usr/share/aclocal" || die "rmdir failed"
+}
diff --git a/dev-lang/vala/vala-0.12.1-r1.ebuild b/dev-lang/vala/vala-0.12.1-r1.ebuild
index 1fbd517e55c0..d321f44ee528 100644
--- a/dev-lang/vala/vala-0.12.1-r1.ebuild
+++ b/dev-lang/vala/vala-0.12.1-r1.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/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.1 2012/08/20 18:39:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.2 2012/08/23 15:25:46 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -37,5 +37,6 @@ pkg_setup() {
src_install() {
gnome2_src_install
- rm -v "${ED}usr/share/aclocal/vala.m4"
+ rm -v "${ED}usr/share/aclocal/vala.m4" || die "rm failed"
+ rmdir "${ED}usr/share/aclocal" || die "rmdir failed"
}