summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2012-09-08 05:54:22 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2012-09-08 05:54:22 +0000
commit7a8a9371427e2dc11bc18372b74a401c701709a5 (patch)
treea80d87c876bdf849fd70aac3dedd66b4dc8410cc /x11-misc/alltray
parentStable arm, bug #433295 (diff)
downloadhistorical-7a8a9371427e2dc11bc18372b74a401c701709a5.tar.gz
historical-7a8a9371427e2dc11bc18372b74a401c701709a5.tar.bz2
historical-7a8a9371427e2dc11bc18372b74a401c701709a5.zip
Revert previous changes. The brokenness is only for mixed stable/unstable systems.
Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/alltray')
-rw-r--r--x11-misc/alltray/ChangeLog6
-rw-r--r--x11-misc/alltray/Manifest30
-rw-r--r--x11-misc/alltray/alltray-0.7.5.1.ebuild11
3 files changed, 23 insertions, 24 deletions
diff --git a/x11-misc/alltray/ChangeLog b/x11-misc/alltray/ChangeLog
index 05d2ac37a387..a22321bd821e 100644
--- a/x11-misc/alltray/ChangeLog
+++ b/x11-misc/alltray/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/alltray
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/ChangeLog,v 1.46 2012/09/08 02:36:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/ChangeLog,v 1.47 2012/09/08 05:54:22 nirbheek Exp $
+
+ 08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> alltray-0.7.5.1.ebuild:
+ Revert previous changes. The brokenness is only for mixed stable/unstable
+ systems.
08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> alltray-0.7.5.1.ebuild:
Use either vala-0.14, or vala-0.18
diff --git a/x11-misc/alltray/Manifest b/x11-misc/alltray/Manifest
index 2e5e1d93b391..e24fc46a53d3 100644
--- a/x11-misc/alltray/Manifest
+++ b/x11-misc/alltray/Manifest
@@ -5,23 +5,23 @@ AUX alltray-0.7.4-include-fixes.patch 1018 SHA256 3048ae8d7121513acc44a81f3e26eb
DIST alltray-0.7.4dev.tar.gz 471569 SHA256 43c986daaec925748d042987bdc289f81db7ccd510bfaf77e2062611232022dc
DIST alltray-0.7.5.1dev.tar.gz 481458 SHA256 09dad447b85ecb57debcb423f34381db7f112a010fbc83e4f65b3b31cf416514 SHA512 4cdba8a1a6d6969205387d985fda0cc479006ad009e3e35614569a5214d302b3852504c4d8ed0cf6557e202b941cc004033b4396a7b11e734a93317d70bc3efe WHIRLPOOL 6e9b65540b322a5f6902a204386cd80467b50f593dcb8933e34157e21f4c4f9c3e312e260f32c0fd31c592f9437f10bb754195ab0868592e24fbd941310117ae
EBUILD alltray-0.7.4.ebuild 887 SHA256 1322e391ee4a2cd4a58fe143c3572b1f2dc7c023dae3a24f7986ea99de7c0d6f SHA512 990b42c1d3d9f20a24823fd6705a42299904ff6f20976b1f52db7a009a4f1aae4151c5d57c27b72ba34a369f1d3993c6a2e13fde49cfce908f872cef782a14c1 WHIRLPOOL 861f3f366fa26c046f795c84193e8444050015913e38ea14a77eab4b89cf87e52eb12ea48e86aabbb9a18f93ea92dd4d612a5ce34fcf253c8ae79c98ecea777c
-EBUILD alltray-0.7.5.1.ebuild 1277 SHA256 7d5dd084c0db889f84f4ab7168e14bcd7a015daef118eb20aeedb6fc96a785f1 SHA512 3057042379387e42d927bd39a9b4d1ac7c4a6e80387785cbde97f6d92a689f65d7f5f7d8ac5a95f1f622f9457254a8728957659ee82c0a88cb937085182b43db WHIRLPOOL f9426e627d134913ae5be7c198eb6d5ec7da4a43d7a9939111cd67d76b60f1e3a0bc1a721c9ab26b24321d12166e79d218d485609d0fbcf317d1cecbeae19900
-MISC ChangeLog 6124 SHA256 42373bd6072006550bcb3a9232d4a3920f8c875ecd36b0f5a918a7e67ccff460 SHA512 1f9019f38ec58df78e6e35db59902e5756d8c003bd057477ca523de233cb30b53c983918674d113c8c47ce22044e6d3bcaa4a7d551b2d62b87591519d2d00eb7 WHIRLPOOL 75b73fde4ee634d5c6064c0c8737a64cf7009ceb8b427863dd9fa832b8608be6eb5847f87c25eb0d6978cd35f264d1ac0f16a2c712c9c0c3125ff9cc370c9b04
+EBUILD alltray-0.7.5.1.ebuild 1125 SHA256 296441146cb6f9cb00bb88cebda0f29705d17312b716e73c1942b047d993eba0 SHA512 43f940234e09ab609294746486de845041505eed05326bf40dcc4e8ce79654fb95bd1415d86e34722b181c05d07109d3d6ecd1cfe81a0902673e5fcb6aaa3613 WHIRLPOOL 3b0b01d11fa39083435dfcfaa77d278bd34b43cd8d9310e238796e79dfd460a608253c8cc1ca6c416565183515b6656a7b9fd1df8daef2c4a7b7e8ac9c9a547a
+MISC ChangeLog 6290 SHA256 e7abac381f448d9a8043690f2ffacc8eb93232b5deb24428155b1f49dd36ec49 SHA512 17a45c72031dca2493c2ea7f51ac8400a188e9cbcbba04013ac7aafc0fac0cdad8541912c245ad8e3e0b5b1e4c11ab54208b97adc06cb191f05d590dd380dd7e WHIRLPOOL 5654d58ee804d3e59cb740316acedc6b47344ef8579b0571453cbc1d35e09a71264d854a0e8934122f1ccefa02149a5f60086f41074724ace679ba9b972711dd
MISC metadata.xml 574 SHA256 e95a331d0a3348fa2332860aa6fbf31a2bd9bea680d7134791206be1e4b384bb SHA512 7aa8f06c9248aef33ba0c0d2745e78e7b103518d307e136e7aca7e5802b8b644d21de345d79adc1f7cad24db0270ee633c5a9eb4708cb2012d44e02e9f98e0a9 WHIRLPOOL e382263a843b7e512d46d52167c984b38cabdb78a6c91677aa7fc3eae9c9fe6c0cfea46b0a311a49dc2b3da678659a72ac8a46c2b33af8774519482040034a7e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQSq84AAoJEO/kOhxWD91kC5EP/RTkRBQpOT+vejKk3O16eQUA
-NUG2rusrsR+GT/9enVdlrc9azaRzPZwIjV2wx1ceu3NQlRGaQp9FHOOGaQWJxim2
-YXsGINP/mEDr8kNXSzwaraBNx5SK/t0QVSVKGVu0ooYFEt434aBvAKnH7MzQgUAz
-774cyVZil03yqLL1W5vo5TsPPK4rffnq+kEB8KLXo4egqrEoFrrFd2qURSSq7tUM
-UK1kJtgpPGPAa9c4znyFaS2JsO8d0q96SHNkYx4CFXXORXfL6WC/Hy8/kadiEFN0
-1dGceJWVR0b7pGUEIZuMO4ECoAV6QhrlK7Rt+1+VXDT2995Shz2+Lx69nGtPPtMK
-x6skENJmN7RGzgXPBI6tSSag1bQ0oVfRNjFW+UkWP7S8/2PP9OPxQZTox4BEkfNO
-jtTZfq0kQzHmqlRoq+mqf8XpDxYW48H8AKbf4gbzMJr/FYzrDcjvcbDnbfHUjs8B
-EO2Kc+dWYEbCv004afyDIH6/TUeXlO7/hfj/UIyz3Qp0kwvTLesu+wQZFDx4gRfo
-D5l+piL4onkMdVVyqTDtCEo2Kh6FspF7CUVx0is94xHwl/gX0j/IX6ZsQeXCJzU6
-Fx0HMXOs8GA6hbAkbZXsLp78oHJ8I0W8S2EqE3CmbI1Hit9feDO5w3TH2WzMpFuJ
-USfnFya82JW0i7UabePc
-=fQFg
+iQIcBAEBCAAGBQJQSt2NAAoJEO/kOhxWD91k1k4P/Rzz22Z79JTfy3gz/Lf2QgIC
+7eN9dLXftmM9xr5Q3f+ogTBkp6JNhf0XlX1MT5NBhdT3HAbPa2fd3ItTu03gdlk5
+bflYe7zPwRTWynepstLVl0BakUoy27pCA3KFpcph+jPMw0mo5EVWMk/nFK/xcC7+
+g9x619l9CM3WennJLsyCxtcWPPI8JoH17mpnv/9kOce3YsDgQX74uYc5RKlm1IS1
+H3T9I0a6fu27OHQ/WCDKPTPZgHTiBCqcYMYiaXcrFzZ5BBNgH44C0sM0upHdxWaI
+WAmR6LgPW1dh3Ok/Cg/bpZtKWRAVEK4BCJDErcQbQtgIQxUXvBZ/d62WRtWch6JO
+gol4yCkjIh9Z6JqADkmarZLFHdlUdEPpVSOi5c8tBEKHDq3gn0LK2AIkrZ/Yg7TS
+Ps6s1xAxxeBRBp4ssGxZQr4fVcKvIL+xS3S/dw/QQv9BkuokZkdA91xnMPOnKg2U
+FivJwWbNfDOSGJXMtazHLwubjfUCwODsq6Lqe5ZOS/jL0Wz/dtIGPXFSmYSUfHh7
+feC6GuNDNIU9MqdLEcqfDaibtO62IoKiROrAXE9y5mDR/wjufC14kHYofOwQ5bYH
+FLbPJHwvJ7GAX6J8wqv8u7WmWRovanXpZnsaxi0WmUrtcR+0do1W0PR7g2bSm5+R
+Y6aJpd3TJeXTZrm66Nz5
+=WO77
-----END PGP SIGNATURE-----
diff --git a/x11-misc/alltray/alltray-0.7.5.1.ebuild b/x11-misc/alltray/alltray-0.7.5.1.ebuild
index e7f97cee04e7..3b9e86614f06 100644
--- a/x11-misc/alltray/alltray-0.7.5.1.ebuild
+++ b/x11-misc/alltray/alltray-0.7.5.1.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/x11-misc/alltray/alltray-0.7.5.1.ebuild,v 1.7 2012/09/08 02:36:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alltray/alltray-0.7.5.1.ebuild,v 1.8 2012/09/08 05:54:22 nirbheek Exp $
EAPI=4
inherit autotools
@@ -24,8 +24,7 @@ RDEPEND="dev-libs/glib:2
x11-libs/libXpm
x11-libs/libwnck:1"
DEPEND="${RDEPEND}
- || ( dev-lang/vala:0.18
- dev-lang/vala:0.14 )
+ dev-lang/vala:0.14
virtual/pkgconfig"
S=${WORKDIR}/${MY_P}
@@ -41,11 +40,7 @@ src_prepare() {
-e '/Icon/s:.png::' \
data/alltray.desktop{,.in} || die
- if has_version "dev-lang/vala:0.18"; then
- sed -i -e '/AC_PATH_PROG/s:valac:valac-0.18:g' configure.ac || die
- else
- sed -i -e '/AC_PATH_PROG/s:valac:valac-0.14:g' configure.ac || die
- fi
+ sed -i -e '/AC_PATH_PROG/s:valac:valac-0.14:g' configure.ac || die
eautoreconf
}