Permalink
Browse files

merge ebuild with the tree

  • Loading branch information...
1 parent d428278 commit 7b0348a462c22e2adb7ac7e1cbf10eed6e330782 @transacid committed Jun 18, 2010
Showing with 18 additions and 10 deletions.
  1. +1 −1 net-im/centerim/Manifest
  2. +17 −9 net-im/centerim/centerim-4.22.9.21.ebuild
View
2 net-im/centerim/Manifest
@@ -1,5 +1,5 @@
DIST centerim-4.22.9.21.tar.gz 2261653 RMD160 2d823e287ae2308d88ee1793a0d335bf2175641d SHA1 c82720b4bdddcdc269ff8d56c6e55812f04283a3 SHA256 c89fe1a20ad388d27adcfa8e099941bbfab5e841658ed047cde4ad0e1e918f5c
-EBUILD centerim-4.22.9.21.ebuild 2689 RMD160 d135baa9ae3b6999e75dccca3585da3378286d4b SHA1 5cce7e210a235873eaa5cf2d68c2b83c90f2c0d1 SHA256 6555e07370446a1febcd7888ab27c54a90fe6073881c185cfee627bee94668c5
+EBUILD centerim-4.22.9.21.ebuild 2770 RMD160 150847afae33a09559b24514587f460c6e4eb6a0 SHA1 6d5a92a702d4aa9a3b3d0aaad6c4b6ffc7554f82 SHA256 b1872937f86561a5b060e686893659cb2d0244d449b0a80cd27cd8acf65817f1
EBUILD centerim-999.ebuild 2733 RMD160 4c8d9de8da6ce93e69809196244d850b26b26aab SHA1 531c09d7d94992d566a6b033722627524c4b6ccc SHA256 5504f76eee07787d2cff5e1d0ca1a54b202ad4ed25ff07ab6db9f3a17cf18a12
MISC ChangeLog 115 RMD160 cd416667d73cfa4863b1cf34d472994a6063ff13 SHA1 c8bcf7b9e7560d162efff7069d65b736a456c4fc SHA256 5bad317feba8c6848b46cd908b45aa46c70bf3490b4220d00620dbee7bf7070d
MISC metadata.xml 544 RMD160 5b8b2c058127604350ee45080d8bb05745ca85e2 SHA1 51d0541ad12707d1b8b42e1f891ed00360c48be2 SHA256 da03c10a6b438cff184f8dc4237dabd33a68aa0b41620e7e28b7c3fff165456f
View
26 net-im/centerim/centerim-4.22.9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -25,18 +25,16 @@ DEPEND=">=sys-libs/ncurses-5.2
)
msn? (
|| (
- <net-misc/curl-7.19.7[ssl]
- >=net-misc/curl-7.19.7[openssl]
- >=net-misc/curl-7.19.7[gnutls]
- >=net-misc/curl-7.19.7[nss]
+ >=net-misc/curl-7.19.6[ssl]
+ >=net-misc/curl-7.19.6[gnutls]
+ >=net-misc/curl-7.19.6[nss]
)
)
yahoo? (
|| (
- <net-misc/curl-7.19.7[ssl]
- >=net-misc/curl-7.19.7[openssl]
- >=net-misc/curl-7.19.7[gnutls]
- >=net-misc/curl-7.19.7[nss]
+ >=net-misc/curl-7.19.6[ssl]
+ >=net-misc/curl-7.19.6[gnutls]
+ >=net-misc/curl-7.19.6[nss]
)
)"
@@ -79,6 +77,16 @@ pkg_setup() {
fi
}
+src_prepare() {
+ default
+
+ # Don't execute git commands, bug #228151
+ cat >"${S}"/misc/git-version-gen <<-EOF
+ #!/bin/sh
+ echo -n "${PVR}"
+ EOF
+}
+
src_configure() {
econf \
$(use_with ssl) \

0 comments on commit 7b0348a

Please sign in to comment.