Sync with portage [Tue Dec 25 12:23:19 MSK 2012].

mhiretskiy
root 12 years ago
parent a0b029c220
commit 3b74e2cf9a

@ -1,3 +1,4 @@
DIST drush-4.4.tar.gz 253012 SHA256 f6af5d259c169d0b3738568c9a8d114c8958df6deb5440fce3b5842e753fc88f SHA512 93f9ac860741d3f35a52d0be9a3548fc9cde438cc42cc3873a0fa74619d323481fb7475f5f8e0ef96e4f32ad3efdd9b9c9582e527c7314eace3ace0c14e752e5 WHIRLPOOL 46a003a0038dba822ed507596f633ebb3bf5a450bc3d1f792a89c1032bebc5221583892e9d69e1da7428c7051fa192c38c487adcf4114bc88ef03f6b631ebbc7
DIST drush-4.5.tar.gz 282760 SHA256 11a8ba3acbebf0be45407dee54a4c59cb9da7dfb461cf4ed9e27e78b2968fc99 SHA512 9ce80f08e8e5ca3a48821dd8db2cac8fa7b6e1d6f6e77319d4f1a84639fc4cc8152e666da31d11f02b2a5b646f81d8a714b483bef48d6ed2b4001cc18a92831b WHIRLPOOL 5efdbc154faf164bc0d0a5959ee6ec07e4446053995a12035b37a664e172ed4f06c7adc7c9d6ac24fbb98603133478dfa2c44c77a91a8688296f7339a751c70c
DIST drush-4.6.tar.gz 290434 SHA256 c8f5a165c1624b023aaa74b4fd852da1dc426bd08f7cf1af328fe16e7de27d8d SHA512 7965a7d191f88e60d9dc19baba3a6e25e10facbe5a84d30681b5b071dbde0c284fddcc8fb76f70c0ccfc115f4603b2c607f3081f523d566bfb397e70983dd3a2 WHIRLPOOL 18fdcbd3349fda8016c6ae512d9f2c1035e53e0122c9241717d66dfaa4c3e3a19d2e13b89c576faa426ab635ff98e3afabe9d664c825df28071d7438e12d31fc
DIST drush-5.1.tar.gz 398390 SHA256 24c701e8e4da60261210227f5e3c666989ce79234b222a8b1f17de137e7efd67 SHA512 2f35eb25914fe6e6da80f1c9b8be1978a17f6f1cfdb822bfd211d56bd0a8dcb1a4d67325dc11920ad61cfa638a5b1e58dec7f49396b589465401b31af703feaa WHIRLPOOL 18cf7374deaddff745441290222a742b82b2183ebb6f5d1c1a079e84607f82839d458bba8aa118d6c07e53cf54e49b1314dc7c199af6582d8fe1a313e3c9ee9c
DIST drush-5.8.tar.gz 409642 SHA256 15dd85f04c49b4a896b02dd6960d3140f3ae680bab3eea5d3aba27be0481e480 SHA512 85f7572aece8590d23164dc938e00b740718a5b9bf20ca866083f9e8ce2025ec07f57e06234bf50bfe2351f407f5bad21789103c1e04d18d2fd202fa735637e6 WHIRLPOOL 68f4a8ca09fc61c36de3d6cc6e3aeaab2021b677ba9d732a65f4d5a9940ebbee3cd63dc84f165e119770168547b1997aff6c23497dc50dbe548df348c296188c

@ -1,35 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.4.ebuild,v 1.1 2011/05/26 22:22:01 ramereth Exp $
EAPI="4"
DESCRIPTION="Drush is a command line shell and scripting interface for Drupal"
HOMEPAGE="http://drupal.org/project/drush"
SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples"
DEPEND="dev-lang/php[cli,simplexml] dev-php/pear"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
src_install() {
local docs="README.txt docs"
insinto /usr/share/drush
doins -r .
exeinto /usr/share/drush
doexe drush
dosym /usr/share/drush/drush /usr/bin/drush
dodoc -r ${docs}
# cleanup
for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore ; do
rm -rf "${D}/usr/share/drush/${i}"
done
use examples && cp -R examples "${D}"/usr/share/doc/"${PF}"
}

@ -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/app-admin/drush/drush-4.5-r1.ebuild,v 1.1 2012/05/13 08:01:48 ramereth Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.5-r1.ebuild,v 1.2 2012/12/25 04:36:13 ramereth Exp $
EAPI="4"
@ -10,7 +10,7 @@ SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="examples"
DEPEND="dev-lang/php[cli,simplexml]

@ -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/app-admin/drush/drush-4.5.ebuild,v 1.1 2012/03/09 05:03:41 ramereth Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.6.ebuild,v 1.1 2012/12/25 04:36:13 ramereth Exp $
EAPI="4"
@ -13,13 +13,23 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples"
DEPEND="dev-lang/php[cli,simplexml] dev-php/pear"
DEPEND="dev-lang/php[cli,simplexml]
dev-php/pear
dev-php/PEAR-Console_Table"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
src_prepare() {
sed -i -e \
"s!/share/doc/drush!/share/doc/${PF}!" \
-e "s!README\.txt!\0.bz2!g" \
includes/environment.inc || die
sed -i -e "s!\.php'!.php.bz2'!" commands/core/docs.drush.inc || die
}
src_install() {
local docs="README.txt docs"
use examples && docs="${docs} examples"
insinto /usr/share/drush
doins -r .
exeinto /usr/share/drush
@ -30,6 +40,5 @@ src_install() {
for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore ; do
rm -rf "${D}/usr/share/drush/${i}"
done
use examples && cp -R examples "${D}"/usr/share/doc/"${PF}"
keepdir /etc/drush
}

@ -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/app-admin/drush/drush-5.1.ebuild,v 1.1 2012/05/13 08:01:51 ramereth Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-5.1.ebuild,v 1.2 2012/12/25 04:36:13 ramereth Exp $
EAPI="4"
@ -12,7 +12,7 @@ SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="+examples"
DEPEND="dev-lang/php[cli,simplexml]

@ -0,0 +1,58 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-5.8.ebuild,v 1.1 2012/12/25 04:36:13 ramereth Exp $
EAPI="4"
inherit bash-completion-r1
DESCRIPTION="Drush is a command line shell and scripting interface for Drupal"
HOMEPAGE="http://drupal.org/project/drush"
SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+examples"
DEPEND="dev-lang/php[cli,simplexml]
dev-php/pear
dev-php/PEAR-Console_Table
dev-php/PEAR-Console_Getopt"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
src_prepare() {
sed -i -e \
"s!/share/doc/drush!/share/doc/${PF}!" \
-e "s!README\.txt!\0.bz2!g" \
includes/bootstrap.inc || die
sed -i \
-e "s!\.php'!.php.bz2'!" \
-e "s!\.ini'!.ini.bz2'!" \
-e "s!\.txt'!.txt.bz2'!" \
-e "s!\.bashrc'!.bashrc.bz2'!" \
commands/core/docs.drush.inc || die
sed \
-e "1,2d" \
-e "5,11d" \
drush.complete.sh > drush.bashcomp
}
src_install() {
local docs="README.txt docs"
use examples && docs="${docs} examples"
insinto /usr/share/drush
doins -r .
exeinto /usr/share/drush
doexe drush
dosym /usr/share/drush/drush /usr/bin/drush
dodoc -r ${docs}
# cleanup
for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore \
.gitignore .travis.yml drush.complete.sh ; do
rm -rf "${D}/usr/share/drush/${i}"
done
keepdir /etc/drush
newbashcomp drush.bashcomp drush
}

@ -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/app-admin/sysstat/sysstat-10.1.3.ebuild,v 1.1 2012/12/24 15:55:57 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.1.3.ebuild,v 1.2 2012/12/24 17:35:33 jer Exp $
EAPI="4"
@ -49,7 +49,6 @@ src_prepare() {
|| die "Number of LINGUAS does not match number of .po files"
unset count
einfo "Keeping these locales: ${LINGUAS}."
for lingua in ${SYSSTAT_LINGUAS}; do
if ! use linguas_${lingua}; then
rm -f "${NLSDIR}/${lingua}.po" || die

@ -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/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild,v 1.4 2012/12/23 16:56:24 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild,v 1.5 2012/12/24 20:11:04 pinkbyte Exp $
EAPI="2"
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc x86 ~x86-macos"
KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-macos"
IUSE="nls"
DEPEND=">=dev-libs/libmcrypt-2.5.8

@ -1,73 +0,0 @@
diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
index 498c0de..5f973fb 100644
--- a/src/plugins/kdb/db2/lockout.c
+++ b/src/plugins/kdb/db2/lockout.c
@@ -158,13 +158,23 @@ krb5_db2_lockout_audit(krb5_context context,
return 0;
}
+ if (entry == NULL)
+ return 0;
+
code = lookup_lockout_policy(context, entry, &max_fail,
&failcnt_interval,
&lockout_duration);
if (code != 0)
return code;
- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
+ /*
+ * Don't continue to modify the DB for an already locked account.
+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
+ * this check is unneeded, but in rare cases, we can fail with an
+ * integrity error or preauth failure before a policy check.)
+ */
+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
+ return 0;
if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
/*
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
index 626ed1f..68e8ec4 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
@@ -131,6 +131,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
CHECK_LDAP_HANDLE(ldap_context);
if (is_principal_in_realm(ldap_context, searchfor) != 0) {
+ st = KRB5_KDB_NOENTRY;
*more = 0;
krb5_set_error_message (context, st, "Principal does not belong to realm");
goto cleanup;
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
index 020c77a..24b9493 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
@@ -150,15 +150,25 @@ krb5_ldap_lockout_audit(krb5_context context,
return 0;
}
+ if (entry == NULL)
+ return 0;
+
code = lookup_lockout_policy(context, entry, &max_fail,
&failcnt_interval,
&lockout_duration);
if (code != 0)
return code;
- entry->mask = 0;
+ /*
+ * Don't continue to modify the DB for an already locked account.
+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
+ * this check is unneeded, but in rare cases, we can fail with an
+ * integrity error or preauth failure before a policy check.)
+ */
+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
+ return 0;
- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
+ entry->mask = 0;
if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
/*

@ -1,33 +0,0 @@
diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c
index b5de64d..cc44e29 100644
--- a/src/kdc/kdc_authdata.c
+++ b/src/kdc/kdc_authdata.c
@@ -495,7 +495,7 @@ merge_authdata (krb5_context context,
krb5_boolean copy,
krb5_boolean ignore_kdc_issued)
{
- size_t i, nadata = 0;
+ size_t i, j, nadata = 0;
krb5_authdata **authdata = *out_authdata;
if (in_authdata == NULL || in_authdata[0] == NULL)
@@ -529,16 +529,16 @@ merge_authdata (krb5_context context,
in_authdata = tmp;
}
- for (i = 0; in_authdata[i] != NULL; i++) {
+ for (i = 0, j = 0; in_authdata[i] != NULL; i++) {
if (ignore_kdc_issued &&
is_kdc_issued_authdatum(context, in_authdata[i], 0)) {
free(in_authdata[i]->contents);
free(in_authdata[i]);
} else
- authdata[nadata + i] = in_authdata[i];
+ authdata[nadata + j++] = in_authdata[i];
}
- authdata[nadata + i] = NULL;
+ authdata[nadata + j] = NULL;
free(in_authdata);

@ -1,202 +0,0 @@
Index: krb5-1.8/src/plugins/preauth/pkinit/pkinit_srv.c
===================================================================
--- krb5-1.8/src/plugins/preauth/pkinit/pkinit_srv.c (revision 24455)
+++ krb5-1.8/src/plugins/preauth/pkinit/pkinit_srv.c (working copy)
@@ -691,8 +691,7 @@
krb5_reply_key_pack *key_pack = NULL;
krb5_reply_key_pack_draft9 *key_pack9 = NULL;
krb5_data *encoded_key_pack = NULL;
- unsigned int num_types;
- krb5_cksumtype *cksum_types = NULL;
+ krb5_cksumtype cksum_type;
pkinit_kdc_context plgctx;
pkinit_kdc_req_context reqctx;
@@ -882,14 +881,25 @@
retval = ENOMEM;
goto cleanup;
}
- /* retrieve checksums for a given enctype of the reply key */
- retval = krb5_c_keyed_checksum_types(context,
- encrypting_key->enctype, &num_types, &cksum_types);
- if (retval)
- goto cleanup;
- /* pick the first of acceptable enctypes for the checksum */
- retval = krb5_c_make_checksum(context, cksum_types[0],
+ switch (encrypting_key->enctype) {
+ case ENCTYPE_DES_CBC_MD4:
+ cksum_type = CKSUMTYPE_RSA_MD4_DES;
+ break;
+ case ENCTYPE_DES_CBC_MD5:
+ case ENCTYPE_DES_CBC_CRC:
+ cksum_type = CKSUMTYPE_RSA_MD5_DES;
+ break;
+ default:
+ retval = krb5int_c_mandatory_cksumtype(context,
+ encrypting_key->enctype,
+ &cksum_type);
+ if (retval)
+ goto cleanup;
+ break;
+ }
+
+ retval = krb5_c_make_checksum(context, cksum_type,
encrypting_key, KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM,
req_pkt, &key_pack->asChecksum);
if (retval) {
@@ -1033,7 +1043,6 @@
krb5_free_data(context, encoded_key_pack);
free(dh_pubkey);
free(server_key);
- free(cksum_types);
switch ((int)padata->pa_type) {
case KRB5_PADATA_PK_AS_REQ:
Index: krb5-1.8/src/lib/crypto/krb/cksumtypes.c
===================================================================
--- krb5-1.8/src/lib/crypto/krb/cksumtypes.c (revision 24455)
+++ krb5-1.8/src/lib/crypto/krb/cksumtypes.c (working copy)
@@ -101,7 +101,7 @@
{ CKSUMTYPE_MD5_HMAC_ARCFOUR,
"md5-hmac-rc4", { 0 }, "Microsoft MD5 HMAC",
- NULL, &krb5int_hash_md5,
+ &krb5int_enc_arcfour, &krb5int_hash_md5,
krb5int_hmacmd5_checksum, NULL,
16, 16, 0 },
};
Index: krb5-1.8/src/lib/crypto/krb/keyed_checksum_types.c
===================================================================
--- krb5-1.8/src/lib/crypto/krb/keyed_checksum_types.c (revision 24455)
+++ krb5-1.8/src/lib/crypto/krb/keyed_checksum_types.c (working copy)
@@ -35,6 +35,13 @@
{
if (ctp->flags & CKSUM_UNKEYED)
return FALSE;
+ /* Stream ciphers do not play well with RFC 3961 key derivation, so be
+ * conservative with RC4. */
+ if ((ktp->etype == ENCTYPE_ARCFOUR_HMAC ||
+ ktp->etype == ENCTYPE_ARCFOUR_HMAC_EXP) &&
+ ctp->ctype != CKSUMTYPE_HMAC_MD5_ARCFOUR &&
+ ctp->ctype != CKSUMTYPE_MD5_HMAC_ARCFOUR)
+ return FALSE;
return (!ctp->enc || ktp->enc == ctp->enc);
}
Index: krb5-1.8/src/lib/crypto/krb/dk/derive.c
===================================================================
--- krb5-1.8/src/lib/crypto/krb/dk/derive.c (revision 24455)
+++ krb5-1.8/src/lib/crypto/krb/dk/derive.c (working copy)
@@ -91,6 +91,8 @@
blocksize = enc->block_size;
keybytes = enc->keybytes;
+ if (blocksize == 1)
+ return KRB5_BAD_ENCTYPE;
if (inkey->keyblock.length != enc->keylength || outrnd->length != keybytes)
return KRB5_CRYPTO_INTERNAL;
Index: krb5-1.8/src/lib/gssapi/krb5/util_crypt.c
===================================================================
--- krb5-1.8/src/lib/gssapi/krb5/util_crypt.c (revision 24455)
+++ krb5-1.8/src/lib/gssapi/krb5/util_crypt.c (working copy)
@@ -119,10 +119,22 @@
if (code != 0)
return code;
- code = (*kaccess.mandatory_cksumtype)(context, subkey->keyblock.enctype,
- cksumtype);
- if (code != 0)
- return code;
+ switch (subkey->keyblock.enctype) {
+ case ENCTYPE_DES_CBC_MD4:
+ *cksumtype = CKSUMTYPE_RSA_MD4_DES;
+ break;
+ case ENCTYPE_DES_CBC_MD5:
+ case ENCTYPE_DES_CBC_CRC:
+ *cksumtype = CKSUMTYPE_RSA_MD5_DES;
+ break;
+ default:
+ code = (*kaccess.mandatory_cksumtype)(context,
+ subkey->keyblock.enctype,
+ cksumtype);
+ if (code != 0)
+ return code;
+ break;
+ }
switch (subkey->keyblock.enctype) {
case ENCTYPE_DES_CBC_MD5:
Index: krb5-1.8/src/lib/krb5/krb/pac.c
===================================================================
--- krb5-1.8/src/lib/krb5/krb/pac.c (revision 24455)
+++ krb5-1.8/src/lib/krb5/krb/pac.c (working copy)
@@ -582,6 +582,8 @@
checksum.checksum_type = load_32_le(p);
checksum.length = checksum_data.length - PAC_SIGNATURE_DATA_LENGTH;
checksum.contents = p + PAC_SIGNATURE_DATA_LENGTH;
+ if (!krb5_c_is_keyed_cksum(checksum.checksum_type))
+ return KRB5KRB_AP_ERR_INAPP_CKSUM;
pac_data.length = pac->data.length;
pac_data.data = malloc(pac->data.length);
Index: krb5-1.8/src/lib/krb5/krb/preauth2.c
===================================================================
--- krb5-1.8/src/lib/krb5/krb/preauth2.c (revision 24455)
+++ krb5-1.8/src/lib/krb5/krb/preauth2.c (working copy)
@@ -1578,7 +1578,9 @@
cksum = sc2->sam_cksum;
- while (*cksum) {
+ for (; *cksum; cksum++) {
+ if (!krb5_c_is_keyed_cksum((*cksum)->checksum_type))
+ continue;
/* Check this cksum */
retval = krb5_c_verify_checksum(context, as_key,
KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM,
@@ -1592,7 +1594,6 @@
}
if (valid_cksum)
break;
- cksum++;
}
if (!valid_cksum) {
Index: krb5-1.8/src/lib/krb5/krb/mk_safe.c
===================================================================
--- krb5-1.8/src/lib/krb5/krb/mk_safe.c (revision 24455)
+++ krb5-1.8/src/lib/krb5/krb/mk_safe.c (working copy)
@@ -215,10 +215,28 @@
for (i = 0; i < nsumtypes; i++)
if (auth_context->safe_cksumtype == sumtypes[i])
break;
- if (i == nsumtypes)
- i = 0;
- sumtype = sumtypes[i];
krb5_free_cksumtypes (context, sumtypes);
+ if (i < nsumtypes)
+ sumtype = auth_context->safe_cksumtype;
+ else {
+ switch (enctype) {
+ case ENCTYPE_DES_CBC_MD4:
+ sumtype = CKSUMTYPE_RSA_MD4_DES;
+ break;
+ case ENCTYPE_DES_CBC_MD5:
+ case ENCTYPE_DES_CBC_CRC:
+ sumtype = CKSUMTYPE_RSA_MD5_DES;
+ break;
+ default:
+ retval = krb5int_c_mandatory_cksumtype(context, enctype,
+ &sumtype);
+ if (retval) {
+ CLEANUP_DONE();
+ goto error;
+ }
+ break;
+ }
+ }
}
if ((retval = krb5_mk_safe_basic(context, userdata, key, &replaydata,
plocal_fulladdr, premote_fulladdr,

@ -1,19 +0,0 @@
diff -up krb5/src/slave/kpropd.c krb5/src/slave/kpropd.c
--- krb5/src/slave/kpropd.c 2010-12-17 11:14:26.000000000 -0500
+++ krb5/src/slave/kpropd.c 2010-12-17 11:41:19.000000000 -0500
@@ -404,11 +404,11 @@ retry:
}
close(s);
- if (iproprole == IPROP_SLAVE)
+ if (iproprole == IPROP_SLAVE) {
close(finet);
-
- if ((ret = WEXITSTATUS(status)) != 0)
- return (ret);
+ if ((ret = WEXITSTATUS(status)) != 0)
+ return (ret);
+ }
}
if (iproprole == IPROP_SLAVE)
break;

@ -1,126 +0,0 @@
diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
index 63ff3b3..b4a90bb 100644
--- a/src/kdc/dispatch.c
+++ b/src/kdc/dispatch.c
@@ -115,7 +115,8 @@ dispatch(void *cb, struct sockaddr *local_saddr, const krb5_fulladdr *from,
kdc_insert_lookaside(pkt, *response);
#endif
- if (is_tcp == 0 && (*response)->length > max_dgram_reply_size) {
+ if (is_tcp == 0 && *response != NULL &&
+ (*response)->length > max_dgram_reply_size) {
too_big_for_udp:
krb5_free_data(kdc_context, *response);
retval = make_too_big_error(response);
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index d677bb2..a356907 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -102,14 +102,18 @@ extern void prepend_err_str (krb5_context ctx, const char *s, krb5_error_code er
#define LDAP_SEARCH(base, scope, filter, attrs) LDAP_SEARCH_1(base, scope, filter, attrs, CHECK_STATUS)
#define LDAP_SEARCH_1(base, scope, filter, attrs, status_check) \
- do { \
- st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, NULL, &timelimit, LDAP_NO_LIMIT, &result); \
- if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
- tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
- if (ldap_server_handle) \
- ld = ldap_server_handle->ldap_handle; \
- } \
- }while (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR && tempst == 0); \
+ tempst = 0; \
+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, \
+ NULL, &timelimit, LDAP_NO_LIMIT, &result); \
+ if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
+ tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
+ if (ldap_server_handle) \
+ ld = ldap_server_handle->ldap_handle; \
+ if (tempst == 0) \
+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, \
+ NULL, NULL, &timelimit, \
+ LDAP_NO_LIMIT, &result); \
+ } \
\
if (status_check != IGNORE_STATUS) { \
if (tempst != 0) { \
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
index 82b0333..84e80ee 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
@@ -302,6 +302,7 @@ krb5_ldap_rebind(krb5_ldap_context *ldap_context,
{
krb5_ldap_server_handle *handle = *ldap_server_handle;
+ ldap_unbind_ext_s(handle->ldap_handle, NULL, NULL);
if ((ldap_initialize(&handle->ldap_handle, handle->server_info->server_name) != LDAP_SUCCESS)
|| (krb5_ldap_bind(ldap_context, handle) != LDAP_SUCCESS))
return krb5_ldap_request_next_handle_from_pool(ldap_context, ldap_server_handle);
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index 86fa4d1..0f49c86 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -487,12 +487,11 @@ is_principal_in_realm(krb5_ldap_context *ldap_context,
* portion, then the first portion of the principal name SHOULD be
* "krbtgt". All this check is done in the immediate block.
*/
- if (searchfor->length == 2)
- if ((strncasecmp(searchfor->data[0].data, "krbtgt",
- FIND_MAX(searchfor->data[0].length, strlen("krbtgt"))) == 0) &&
- (strncasecmp(searchfor->data[1].data, defrealm,
- FIND_MAX(searchfor->data[1].length, defrealmlen)) == 0))
+ if (searchfor->length == 2) {
+ if (data_eq_string(searchfor->data[0], "krbtgt") &&
+ data_eq_string(searchfor->data[1], defrealm))
return 0;
+ }
/* first check the length, if they are not equal, then they are not same */
if (strlen(defrealm) != searchfor->realm.length)
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
index 140db1a..552e39a 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
@@ -78,10 +78,10 @@ krb5_error_code
krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
unsigned int flags, krb5_db_entry **entry_ptr)
{
- char *user=NULL, *filter=NULL, **subtree=NULL;
+ char *user=NULL, *filter=NULL, *filtuser=NULL;
unsigned int tree=0, ntrees=1, princlen=0;
krb5_error_code tempst=0, st=0;
- char **values=NULL, *cname=NULL;
+ char **values=NULL, **subtree=NULL, *cname=NULL;
LDAP *ld=NULL;
LDAPMessage *result=NULL, *ent=NULL;
krb5_ldap_context *ldap_context=NULL;
@@ -115,12 +115,18 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
if ((st=krb5_ldap_unparse_principal_name(user)) != 0)
goto cleanup;
- princlen = strlen(FILTER) + strlen(user) + 2 + 1; /* 2 for closing brackets */
+ filtuser = ldap_filter_correct(user);
+ if (filtuser == NULL) {
+ st = ENOMEM;
+ goto cleanup;
+ }
+
+ princlen = strlen(FILTER) + strlen(filtuser) + 2 + 1; /* 2 for closing brackets */
if ((filter = malloc(princlen)) == NULL) {
st = ENOMEM;
goto cleanup;
}
- snprintf(filter, princlen, FILTER"%s))", user);
+ snprintf(filter, princlen, FILTER"%s))", filtuser);
if ((st = krb5_get_subtree_info(ldap_context, &subtree, &ntrees)) != 0)
goto cleanup;
@@ -207,6 +213,9 @@ cleanup:
if (user)
free(user);
+ if (filtuser)
+ free(filtuser);
+
if (cname)
free(cname);

@ -1,13 +0,0 @@
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 46b5fa1..464cb6e 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -741,6 +741,8 @@ prepare_error_as (struct kdc_request_state *rstate, krb5_kdc_req *request,
pad->contents = td[size]->data;
pad->length = td[size]->length;
pa[size] = pad;
+ td[size]->data = NULL;
+ td[size]->length = 0;
}
krb5_free_typed_data(kdc_context, td);
}

@ -1,39 +0,0 @@
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index 1124445..0056885 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -52,6 +52,7 @@ process_chpw_request(context, server_handle, realm, keytab,
ret = 0;
rep->length = 0;
+ rep->data = NULL;
auth_context = NULL;
changepw = NULL;
@@ -76,8 +77,13 @@ process_chpw_request(context, server_handle, realm, keytab,
plen = (*ptr++ & 0xff);
plen = (plen<<8) | (*ptr++ & 0xff);
- if (plen != req->length)
- return(KRB5KRB_AP_ERR_MODIFIED);
+ if (plen != req->length) {
+ ret = KRB5KRB_AP_ERR_MODIFIED;
+ numresult = KRB5_KPASSWD_MALFORMED;
+ strlcpy(strresult, "Request length was inconsistent",
+ sizeof(strresult));
+ goto chpwfail;
+ }
/* verify version number */
@@ -531,6 +537,10 @@ cleanup:
if (local_kaddrs != NULL)
krb5_free_addresses(server_handle->context, local_kaddrs);
+ if ((*response)->data == NULL) {
+ free(*response);
+ *response = NULL;
+ }
krb5_kt_close(server_handle->context, kt);
return ret;

@ -1,40 +0,0 @@
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index f46cad3..102fbaa 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -67,6 +67,7 @@ check-unix:: rtest
check-pytests::
$(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
+ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
install::
$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index c169c54..840a2ef 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -243,7 +243,8 @@ tgt_again:
if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
errcode = find_alternate_tgs(request, &server);
firstpass = 0;
- goto tgt_again;
+ if (errcode == 0)
+ goto tgt_again;
}
}
status = "UNKNOWN_SERVER";
diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
new file mode 100644
index 0000000..1760bcd
--- /dev/null
+++ b/src/kdc/t_emptytgt.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+from k5test import *
+
+realm = K5Realm(start_kadmind=False, create_host=False)
+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
+if 'not found in Kerberos database' not in output:
+ fail('TGT lookup for empty realm failed in unexpected way')
+success('Empty tgt lookup.')

@ -1,13 +0,0 @@
diff --git a/tests/asn.1/trval.c b/tests/asn.1/trval.c
index 780d60c..ffd66ac 100644
--- a/tests/asn.1/trval.c
+++ b/tests/asn.1/trval.c
@@ -176,7 +176,7 @@ int trval2(fp, enc, len, lev, rlen)
int lev;
int *rlen;
{
- int l, eid, elen, xlen, r, rlen2;
+ int l, eid, elen, xlen, r, rlen2 = 0;
int rlen_ext = 0;
r = OK;

@ -55,3 +55,13 @@ index 7dc5b47..cd90db8 100644
*ret_new_profile = NULL;
--- a/src/lib/krb5/krb/preauth2.c 2012-12-24 12:39:18.432678497 +0100
+++ b/src/lib/krb5/krb/preauth2.c 2012-12-24 12:50:49.444099126 +0100
@@ -956,7 +956,7 @@
size_t i, h;
int out_pa_list_size = 0;
krb5_pa_data **out_pa_list = NULL;
- krb5_error_code ret, module_ret;
+ krb5_error_code ret, module_ret = 0;
krb5_responder_fn responder = opte->opt_private->responder;
static const int paorder[] = { PA_INFO, PA_REAL };

@ -1,112 +0,0 @@
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index 1ca09b4..60caf3d 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -102,14 +102,18 @@ extern void prepend_err_str (krb5_context ctx, const char *s, krb5_error_code er
#define LDAP_SEARCH(base, scope, filter, attrs) LDAP_SEARCH_1(base, scope, filter, attrs, CHECK_STATUS)
#define LDAP_SEARCH_1(base, scope, filter, attrs, status_check) \
- do { \
- st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, NULL, &timelimit, LDAP_NO_LIMIT, &result); \
- if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
- tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
- if (ldap_server_handle) \
- ld = ldap_server_handle->ldap_handle; \
- } \
- }while (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR && tempst == 0); \
+ tempst = 0; \
+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, \
+ NULL, &timelimit, LDAP_NO_LIMIT, &result); \
+ if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
+ tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
+ if (ldap_server_handle) \
+ ld = ldap_server_handle->ldap_handle; \
+ if (tempst == 0) \
+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, \
+ NULL, NULL, &timelimit, \
+ LDAP_NO_LIMIT, &result); \
+ } \
\
if (status_check != IGNORE_STATUS) { \
if (tempst != 0) { \
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
index 82b0333..84e80ee 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
@@ -302,6 +302,7 @@ krb5_ldap_rebind(krb5_ldap_context *ldap_context,
{
krb5_ldap_server_handle *handle = *ldap_server_handle;
+ ldap_unbind_ext_s(handle->ldap_handle, NULL, NULL);
if ((ldap_initialize(&handle->ldap_handle, handle->server_info->server_name) != LDAP_SUCCESS)
|| (krb5_ldap_bind(ldap_context, handle) != LDAP_SUCCESS))
return krb5_ldap_request_next_handle_from_pool(ldap_context, ldap_server_handle);
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index f549e23..b70940f 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -446,12 +446,11 @@ is_principal_in_realm(krb5_ldap_context *ldap_context,
* portion, then the first portion of the principal name SHOULD be
* "krbtgt". All this check is done in the immediate block.
*/
- if (searchfor->length == 2)
- if ((strncasecmp(searchfor->data[0].data, "krbtgt",
- FIND_MAX(searchfor->data[0].length, strlen("krbtgt"))) == 0) &&
- (strncasecmp(searchfor->data[1].data, defrealm,
- FIND_MAX(searchfor->data[1].length, defrealmlen)) == 0))
+ if (searchfor->length == 2) {
+ if (data_eq_string(searchfor->data[0], "krbtgt") &&
+ data_eq_string(searchfor->data[1], defrealm))
return 0;
+ }
/* first check the length, if they are not equal, then they are not same */
if (strlen(defrealm) != searchfor->realm.length)
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
index 7ad31da..626ed1f 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
@@ -103,10 +103,10 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
unsigned int flags, krb5_db_entry *entries,
int *nentries, krb5_boolean *more)
{
- char *user=NULL, *filter=NULL, **subtree=NULL;
+ char *user=NULL, *filter=NULL, *filtuser=NULL;
unsigned int tree=0, ntrees=1, princlen=0;
krb5_error_code tempst=0, st=0;
- char **values=NULL, *cname=NULL;
+ char **values=NULL, **subtree=NULL, *cname=NULL;
LDAP *ld=NULL;
LDAPMessage *result=NULL, *ent=NULL;
krb5_ldap_context *ldap_context=NULL;
@@ -142,12 +142,18 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
if ((st=krb5_ldap_unparse_principal_name(user)) != 0)
goto cleanup;
- princlen = strlen(FILTER) + strlen(user) + 2 + 1; /* 2 for closing brackets */
+ filtuser = ldap_filter_correct(user);
+ if (filtuser == NULL) {
+ st = ENOMEM;
+ goto cleanup;
+ }
+
+ princlen = strlen(FILTER) + strlen(filtuser) + 2 + 1; /* 2 for closing brackets */
if ((filter = malloc(princlen)) == NULL) {
st = ENOMEM;
goto cleanup;
}
- snprintf(filter, princlen, FILTER"%s))", user);
+ snprintf(filter, princlen, FILTER"%s))", filtuser);
if ((st = krb5_get_subtree_info(ldap_context, &subtree, &ntrees)) != 0)
goto cleanup;
@@ -231,6 +237,9 @@ cleanup:
if (user)
free(user);
+ if (filtuser)
+ free(filtuser);
+
if (cname)
free(cname);

@ -1,35 +0,0 @@
diff --git a/src/kadmin/server/network.c b/src/kadmin/server/network.c
index c8ce4f1..bb911ff 100644
--- a/src/kadmin/server/network.c
+++ b/src/kadmin/server/network.c
@@ -1384,6 +1384,10 @@ cleanup:
if (local_kaddrs != NULL)
krb5_free_addresses(server_handle->context, local_kaddrs);
+ if ((*response)->data == NULL) {
+ free(*response);
+ *response = NULL;
+ }
krb5_kt_close(server_handle->context, kt);
return ret;
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index c1b2217..992b55f 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -74,8 +74,13 @@ process_chpw_request(context, server_handle, realm, keytab,
plen = (*ptr++ & 0xff);
plen = (plen<<8) | (*ptr++ & 0xff);
- if (plen != req->length)
- return(KRB5KRB_AP_ERR_MODIFIED);
+ if (plen != req->length) {
+ ret = KRB5KRB_AP_ERR_MODIFIED;
+ numresult = KRB5_KPASSWD_MALFORMED;
+ strlcpy(strresult, "Request length was inconsistent",
+ sizeof(strresult));
+ goto chpwfail;
+ }
/* verify version number */

@ -1,25 +0,0 @@
http://krbdev.mit.edu/rt/Ticket/Display.html?id=7000
Index: trunk/src/kadmin/server/ipropd_svc.c
===================================================================
diff -u -N -r24961 -r25433
--- trunk/src/kadmin/server/ipropd_svc.c (.../ipropd_svc.c) (revision 24961)
+++ trunk/src/kadmin/server/ipropd_svc.c (.../ipropd_svc.c) (revision 25433)
@@ -380,7 +380,7 @@
_("%s: pclose(popen) failed: %s"),
whoami,
error_message(errno));
- goto out;
+ _exit(1);
}
DPRINT(("%s: exec `kprop -f %s %s' ...\n",
@@ -401,7 +401,7 @@
_("%s: exec failed: %s"),
whoami,
error_message(errno));
- goto out;
+ _exit(1);
}
default: /* parent */

@ -1,93 +0,0 @@
--- a/src/tests/dejagnu/config/default.exp 2010-04-21 01:37:22.000000000 +0300
+++ b/src/tests/dejagnu/config/default.exp 2010-11-24 16:51:53.000000000 +0200
@@ -1619,7 +1619,7 @@
set spawnid $spawn_id
set pid [exp_pid]
- set markstr "===MARK $pid [clock format [clock seconds]] ==="
+ set markstr "===MARK $pid [clock seconds] ==="
puts $f $markstr
flush $f
--- a/src/tests/dejagnu/krb-standalone/gssapi.exp 2009-06-11 20:27:45.000000000 +0300
+++ b/src/tests/dejagnu/krb-standalone/gssapi.exp 2010-11-24 16:52:21.000000000 +0200
@@ -182,7 +182,7 @@
}
}
catch "expect_after"
- if ![check_exit_status $test] {
+ if { [check_exit_status $test] == 0 } {
# check_exit_staus already calls fail for us
return
}
@@ -209,59 +209,59 @@
global portbase
# Start up the kerberos and kadmind daemons.
- if ![start_kerberos_daemons 0] {
+ if { [start_kerberos_daemons 0] == 0 } {
perror "failed to start kerberos daemons"
}
# Use kadmin to add a key for us.
- if ![add_kerberos_key gsstest0 0] {
+ if { [add_kerberos_key gsstest0 0] == 0 } {
perror "failed to set up gsstest0 key"
}
# Use kadmin to add a key for us.
- if ![add_kerberos_key gsstest1 0] {
+ if { [add_kerberos_key gsstest1 0] ==0 } {
perror "failed to set up gsstest1 key"
}
# Use kadmin to add a key for us.
- if ![add_kerberos_key gsstest2 0] {
+ if { [add_kerberos_key gsstest2 0] == 0 } {
perror "failed to set up gsstest2 key"
}
# Use kadmin to add a key for us.
- if ![add_kerberos_key gsstest3 0] {
+ if { [add_kerberos_key gsstest3 0] == 0 } {
perror "failed to set up gsstest3 key"
}
# Use kadmin to add a service key for us.
- if ![add_random_key gssservice/$hostname 0] {
+ if { [add_random_key gssservice/$hostname 0] == 0 } {
perror "failed to set up gssservice/$hostname key"
}
# Use kdb5_edit to create a srvtab entry for gssservice
- if ![setup_srvtab 0 gssservice] {
+ if { [setup_srvtab 0 gssservice] == 0 } {
perror "failed to set up gssservice srvtab"
}
catch "exec rm -f $tmppwd/gss_tk_0 $tmppwd/gss_tk_1 $tmppwd/gss_tk_2 $tmppwd/gss_tk_3"
# Use kinit to get a ticket.
- if ![our_kinit gsstest0 gsstest0$KEY $tmppwd/gss_tk_0] {
+ if { [our_kinit gsstest0 gsstest0$KEY $tmppwd/gss_tk_0] == 0 } {
perror "failed to kinit gsstest0"
}
# Use kinit to get a ticket.
- if ![our_kinit gsstest1 gsstest1$KEY $tmppwd/gss_tk_1] {
+ if { [our_kinit gsstest1 gsstest1$KEY $tmppwd/gss_tk_1] == 0 } {
perror "failed to kinit gsstest1"
}
# Use kinit to get a ticket.
- if ![our_kinit gsstest2 gsstest2$KEY $tmppwd/gss_tk_2] {
+ if { [our_kinit gsstest2 gsstest2$KEY $tmppwd/gss_tk_2] == 0 } {
perror "failed to kinit gsstest2"
}
# Use kinit to get a ticket.
- if ![our_kinit gsstest3 gsstest3$KEY $tmppwd/gss_tk_3] {
+ if { [our_kinit gsstest3 gsstest3$KEY $tmppwd/gss_tk_3] == 0 } {
perror "failed to kinit gsstest3"
}

@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4,v 1.1 2012/12/23 01:25:26 alonbl Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4,v 1.2 2012/12/24 17:13:25 alonbl Exp $
STARTUP_MODE='save';
@ -29,6 +29,7 @@ checkconfig() {
start() {
ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
checkconfig || eend $?
checkpath -d -m 0775 -o tss /var/run/tpm
start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
eend $?
}

@ -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/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild,v 1.1 2012/12/23 01:25:26 alonbl Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild,v 1.1 2012/12/24 17:13:25 alonbl Exp $
EAPI=2
inherit user linux-mod cmake-utils udev
@ -64,9 +64,6 @@ src_install() {
newinitd "${FILESDIR}"/${PN}.initd-0.7.4 ${PN}
newconfd "${FILESDIR}"/${PN}.confd-0.7.4 ${PN}
keepdir /var/run/tpm
fowners tss /var/run/tpm
keepdir /var/log/tpm
fowners tss:tss /var/log/tpm
}

@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.1 2012/12/24 07:34:07 ramereth Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.2 2012/12/24 17:52:08 ramereth Exp $
EAPI="4"
PYTHON_DEPEND="2"
PYTHON_DEPEND="2:2.6"
inherit eutils confutils bash-completion-r1 python
@ -33,17 +33,11 @@ HOMEPAGE="http://code.google.com/p/ganeti/"
LICENSE="GPL-2"
SLOT="0"
IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6
haskell-daemons rbd"
haskell-daemons rbd test"
REQUIRED_USE="|| ( kvm xen lxc )"
S="${WORKDIR}/${MY_P}"
if use test ; then
PYTHON_DEPEND=">=dev-lang/python-2.6[ipv6]"
else
PYTHON_DEPEND=">=dev-lang/python-2.6"
fi
DEPEND="xen? ( >=app-emulation/xen-3.0 )
kvm? ( app-emulation/qemu )
lxc? ( app-emulation/lxc )
@ -78,10 +72,10 @@ DEPEND="xen? ( >=app-emulation/xen-3.0 )
sys-apps/iproute2
sys-fs/lvm2
>=sys-apps/baselayout-2.0
${PYTHON_DEPEND}
${GIT_DEPEND}"
RDEPEND="${DEPEND}
!app-emulation/ganeti-htools"
DEPEND+=" test? ( || ( dev-lang/python:2.7[ipv6] dev-lang/python:2.6[ipv6] ) )"
pkg_setup () {
confutils_use_depend_all haskell-daemons htools

@ -1,3 +1,2 @@
DIST libvirt-glib-0.1.0.tar.gz 684701 SHA256 20e101d9e331ebef6c0c1e556658fc53334a4063f44665423907937dac0a6cf2 SHA512 5fce4dfa5448c61cf8f127c948c25ab5717250f199c432a429259144597636e6f5450eb0c52e092b2aab7436bdb0670a346d526a19937d706448fd7234104a52 WHIRLPOOL 16b1282ae13ce0648fa40a6b2c60fda4a9eab9bf56739d79da2fa363de58e948a238f7310444ef805c7942d321fa675e32712d8a02722328eef416da293bdd4c
DIST libvirt-glib-0.1.2.tar.gz 694180 SHA256 ae0760e8719e43a31295025b9070283ad459e6294cfc370319925b9044b3d209 SHA512 8615b18b161f0337c4ca4cd75312120cd234349b1a46ba22c05f609d7fae6f7afab6fd7f5ffd18266295631a5a214f6fdd9e17ea5b6d09f3e16033ea8c3e22aa WHIRLPOOL 05187a11a7d07b5b93e6cb22b80c77acd53125e744d1063133862c51edfb644e4ab4bd9c4a88c23033dd7541d6cd06cc49dcdd33b73f122816f234e4fb8efe35
DIST libvirt-glib-0.1.3.tar.gz 699833 SHA256 f90c8f78a6e5274ff79df44c22414e307c9d5c5f782fb9bc31af0d2b1b408be5 SHA512 91439cf8c47ad3d4437bf9817f2edffcdea1022a36a94fa304424cd54fab378cc667e5bd191f4e145a1d44adf5ada400bd8d19387aaa6fe4093e9e6a1eb63fa7 WHIRLPOOL d767c0a49dd84d1fb4f8e02ac12b2da5937478041fae790bc9aca3421b05e7005c616eaed06198b5bc9c3464fdec590fa8f836d977e2c5e685cb99d6271c775c
DIST libvirt-glib-0.1.4.tar.gz 707510 SHA256 92935ff19424a75db85d13f30e28f418a38d81565cf1584945dda145a03886a4 SHA512 8845098bbd24aba1b65efb35808e9ca1e7d6aad85a4e07b8f6c74a64e92e3b4620d0dd243590d09b80cbbd5db2fe230d4a9b64fe002ede59fa9633bbbf299608 WHIRLPOOL d7fb858fb8057d5512aeb98bed043c3c6c87abe8c72f10b557043c9ce894d18462f23f0aa6070434bf23c069a69cdd85d4cb6fd2b4c468cab74eb38d2df389c4

@ -1,45 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.1.0.ebuild,v 1.1 2012/07/16 16:47:11 cardoe Exp $
EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit gnome2 python
DESCRIPTION="GLib and GObject mappings for libvirt"
HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc +introspection python +vala"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
dev-libs/libxml2:2
>=app-emulation/libvirt-0.9.10
>=dev-libs/glib-2.10:2
introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.10 )
vala? ( dev-lang/vala:0.14 )"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
G2CONF="--disable-test-coverage
VAPIGEN=$(type -P vapigen-0.14)
$(use_enable introspection)
$(use_enable vala)
$(use_with python)"
python_set_active_version 2
python_pkg_setup
}
src_compile() {
emake -j1
}

@ -1,13 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.1.2.ebuild,v 1.1 2012/09/29 13:39:02 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.1.4.ebuild,v 1.1 2012/12/24 20:28:46 pacho Exp $
EAPI="4"
EAPI=5
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
VALA_MIN_API_VERSION="0.14"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit gnome2 python vala
inherit gnome2 python-single-r1 vala
DESCRIPTION="GLib and GObject mappings for libvirt"
HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
@ -16,34 +17,24 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc +introspection python +vala"
IUSE="+introspection python +vala"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
dev-libs/libxml2:2
>=app-emulation/libvirt-0.9.10
RDEPEND="dev-libs/libxml2:2
>=app-emulation/libvirt-0.9.10:=
>=dev-libs/glib-2.10:2
introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}
dev-util/gtk-doc-am
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.10 )
vala? ( $(vala_depend) )"
src_prepare() {
use vala && vala_src_prepare
}
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
G2CONF="--disable-test-coverage
G2CONF+="--disable-test-coverage
--disable-static
$(use_enable introspection)
$(use_enable vala)
$(use_with python)"
python_set_active_version 2
python_pkg_setup
}
src_compile() {
emake -j1
use python && python-single-r1_pkg_setup
}

@ -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/app-misc/abook/abook-0.6.0_pre2.ebuild,v 1.5 2012/12/23 17:08:41 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/abook-0.6.0_pre2.ebuild,v 1.6 2012/12/25 03:34:04 jdhore Exp $
EAPI=3
@ -13,7 +13,7 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="sys-libs/ncurses

@ -1,31 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.8.1.ebuild,v 1.2 2012/09/12 15:28:47 qnikst Exp $
# ebuild generated by hackport 0.2.13
EAPI="3"
CABAL_FEATURES="lib profile haddock hscolour"
inherit haskell-cabal
MY_PN=hsql-sqlite3
MY_P=${MY_PN}-${PV}
DESCRIPTION="SQLite3 driver for HSQL."
HOMEPAGE="http://hackage.haskell.org/package/hsql-sqlite3"
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hsql-1.8
>=dev-lang/ghc-6.10.1
>=dev-db/sqlite-3.0"
DEPEND="${RDEPEND}
dev-haskell/cabal"
S="${WORKDIR}/${MY_P}"

@ -1,31 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.8.2.ebuild,v 1.1 2012/10/28 16:21:07 slyfox Exp $
# ebuild generated by hackport 0.2.13
EAPI="3"
CABAL_FEATURES="lib profile haddock hscolour"
inherit haskell-cabal
MY_PN=hsql-sqlite3
MY_P=${MY_PN}-${PV}
DESCRIPTION="SQLite3 driver for HSQL."
HOMEPAGE="http://hackage.haskell.org/package/hsql-sqlite3"
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-haskell/hsql-1.8.2
>=dev-lang/ghc-6.10.1
>=dev-db/sqlite-3.0"
DEPEND="${RDEPEND}
dev-haskell/cabal"
S="${WORKDIR}/${MY_P}"

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>haskell</herd>
<maintainer>
<email>haskell@gentoo.org</email>
</maintainer>
</pkgmetadata>

@ -1,2 +1 @@
DIST hsql-sqlite3-1.8.1.tar.gz 4767 SHA256 669c7a011bbee0a2cfcb2ada3b2cfef1c08a3b75a63198f2531e29f88dc41b3d SHA512 0b8a504e0e850cd2b8ad857898f994b5b7641ea9243fe24c3ce8694eb6826744ca3e85cb0eca3e66e3baeefc05332f7c507c67b40c3e225fc18f4edb45028ff1 WHIRLPOOL 36681c8164afa2633c32fd5a6d519118b3569b46eb7a5ae45c5b6670da164633d125be7c5eaffd3132e7ce6dddc7378a331adc271c6fa16bc45631c3d74f6062
DIST hsql-sqlite3-1.8.2.tar.gz 4752 SHA256 94f95e93117f8bba01f4c098cd37a730a015baa7660a3eebcd4e85491c71c795 SHA512 962d4396a3844f4d1b4f4be6f6d81e085f1deaa2e7ca0776a93aed4f34cb5e40edab96d568fa3a086ea0c4017dff7de8dd1d25e81ad27840c844ed885af5e42e WHIRLPOOL 3fa850693c2086dc49b36620b0f634b748d6ce31af81810e8b58a6fd39f4556847b80eb1c104f0550765173ce9ba73e5e668970701f779f7c207042ab8cc9f04

@ -0,0 +1,25 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild,v 1.1 2012/12/24 22:22:47 slyfox Exp $
EAPI=5
# ebuild generated by hackport 0.3.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="SQLite3 driver for HSQL."
HOMEPAGE="http://hackage.haskell.org/package/hsql-sqlite3"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-db/sqlite-3.0
>=dev-haskell/hsql-1.8.2:=[profile?]
>=dev-lang/ghc-6.10.4:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-0"

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>haskell</herd>
<maintainer>
<email>haskell@gentoo.org</email>
</maintainer>
<longdescription>
A Haskell Interface to SQLite 3 via libsqlite3
in the standard library path.
</longdescription>
</pkgmetadata>

@ -1,6 +1,2 @@
DIST HUnit-1.2.0.3.tar.gz 6849 SHA256 954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12 SHA512 5159a18fa71991d19721487b66da109bf3a273ab1cf4554cce0e762080678109d8455d49e6983c4cb62ac298f5fb5abf4612cc270696aa76afc630d595f35e97 WHIRLPOOL 426e0918ecb6ec8562ed4d7ffef56388bf8c0674e907c87af1f9290106f147eb5fa75cccb721c9dcc7576d6d7b26b4664b45a04ec3ba394cdbaf3efa7e2dcab1
DIST HUnit-1.2.2.1.tar.gz 22386 SHA256 47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853 SHA512 a426aab07275d1aca1ab6e6a8000fa19382220bf81838274163642a10209feb245153696b2940bbeb65ef7f99e7b369ebbce91e1fad31d8d85fa7510a76f28fa WHIRLPOOL a4e5b5fa6cfe8ce45fe8141b3a9aaa4a473812df1680218396bbffc79c3047eeac273b6c05926ecb264dd348d397c2bb65e00f2e51aa43533b9fefc513951120
DIST HUnit-1.2.2.3.tar.gz 22665 SHA256 bf6bb9b7ec3415c6279af5629fd0f40dd2f67110edea4fdd2a70791280361195 SHA512 a06b3b2b19b3ba0d6b165c20a42ca649a190817ee2d21bf4c114feb197984dbd6af51c224fc01207d34d2b8bfa4347fa1b1cb5d75de93410c144fa38858fd682 WHIRLPOOL 2a87575660bd8b9e6d77fd37d0f323ffb3316198731fd4d77ee9985a4e5b10905e501adf3d6c2b090f38ad9835a51c0a98673db9c254d73802f0a746a1549ca8
DIST HUnit-1.2.4.2.tar.gz 23558 SHA256 fdbcbc28196d616b449bf3e46c30dcd5577dc92f290458e2dbdbfc5a65de327a SHA512 cce6062e7471746d23d9755b60d39cb189f27a513eb6a50c2c67619ea265658c3a03263143e15ebaa65c5cbece8ca8c6df9a5a8eb7cce0f43e164d8ee41e1829 WHIRLPOOL f81b18610aaa1d253a57b45a030237355f6bc79830a43195c5be0fdf0853f9a02d57b59e01880511c1b9ccc0a761c874a6cd14527342d196f9a817679cecf1bb
DIST HUnit-1.2.4.3.tar.gz 23976 SHA256 797deeb5dec7109bf6dcbfc87d0149fd93903227323f1d2d319e72241ed0626a SHA512 2e7232af915fa24b6c36fd8eae4e249269a8ca7d388272b97ea37cc9d49a6dd06a4ad4b4e8ca1e416b413bca4e2c3f609cf2efdf4f11121f63767be814bf79ef WHIRLPOOL 68836f4a96a8bf3e10f5a9c5cd8e554c3e94bab21d5b18e32634f8d7607c6eba7915cf02c2aadc82b3b49a176be510cd6218610ba826bb55933308cd5aa5e4ee
DIST HUnit-1.2.5.1.tar.gz 24221 SHA256 bc0c15d20ee7cedf35fadcaf9cc15b5c2b4ce2df9d80e61bfcdd65ef1ef64471 SHA512 951a2b1703985ef4a84da0d25239c47c7a37bf0140df52746237d32313484f177207d4b0dbb7548dafc12640b8f04b52be97825a4b08010b5120aac142549565 WHIRLPOOL 0d348438092ea8f6be411f0c2c4b448f6cf23930fa90cb3ee69dcefd18543bd481f5b9a3bf48f8a2c7e3340b6e219a5e199cb6e91f61e50cc92723db084412e5

@ -1,32 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.0.3.ebuild,v 1.9 2012/09/12 15:22:34 qnikst Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal
MY_PN="HUnit"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A unit testing framework for Haskell"
HOMEPAGE="http://hunit.sourceforge.net/"
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND=">=dev-lang/ghc-6.6.1
>=dev-haskell/cabal-1.2"
RDEPEND=">=dev-lang/ghc-6.6.1"
S="${WORKDIR}/${MY_P}"
src_install () {
cabal_src_install
if use doc; then
dohtml -r "${S}/doc/"*
fi
}

@ -1,39 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.2.1.ebuild,v 1.4 2012/09/12 15:22:34 qnikst Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal
MY_PN="HUnit"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A unit testing framework for Haskell"
HOMEPAGE="http://hunit.sourceforge.net/"
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.6.1"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2"
S="${WORKDIR}/${MY_P}"
src_install () {
cabal_src_install
if use doc; then
dohtml -r "${S}/doc/"*
fi
}
src_install() {
cabal_src_install
# remove hunit self-tests, we don't want to install them
rm -rf "${D}/usr/bin"
}

@ -1,40 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.2.3.ebuild,v 1.3 2012/09/12 15:22:34 qnikst Exp $
# ebuild generated by hackport 0.2.9
CABAL_FEATURES="lib profile haddock hscolour"
inherit haskell-cabal
MY_PN="HUnit"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A unit testing framework for Haskell"
HOMEPAGE="http://hunit.sourceforge.net/"
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.8.2"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
S="${WORKDIR}/${MY_P}"
src_install () {
cabal_src_install
if use doc; then
dohtml -r "${S}/doc/"*
fi
}
src_install() {
cabal_src_install
# remove hunit self-tests, we don't want to install them
rm -rf "${D}/usr/bin"
}

@ -1,43 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.4.3.ebuild,v 1.3 2012/09/12 15:22:34 qnikst Exp $
EAPI=4
# ebuild generated by hackport 0.2.18.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
MY_PN="HUnit"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A unit testing framework for Haskell"
HOMEPAGE="http://hunit.sourceforge.net/"
SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
RDEPEND="dev-haskell/deepseq[profile?]
>=dev-lang/ghc-6.8.2"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
S="${WORKDIR}/${MY_P}"
src_install () {
cabal_src_install
if use doc; then
dohtml -r "${S}/doc/"*
fi
}
src_install() {
cabal_src_install
# remove hunit self-tests, we don't want to install them
rm -rf "${ED}/usr/bin"
}

@ -1,4 +1,3 @@
DIST btparser-0.16.tar.xz 309320 SHA256 cb3337a282ef87010631861c2992fa397533b2331cfa2f84e50b62bfb2ae6272 SHA512 1fe347bcc04c080e5bace421beb88d0372732cd670b688c0b597d617746857792bbd582643946d8842bf61cd013d3863f34229682148e2f9a4a9828957f89af0 WHIRLPOOL 91d8228228524e4f021b3ad62bec2d99440fc801635c088cb9cc43ed500324743c87ad0a255af95d101cf0c0bceb760f27e0fb5bd40d5900b8d8b145c0b18e67
DIST btparser-0.17.tar.xz 309636 SHA256 3747087f15d56c08af6e3cafe6bd1b5f2eb8c1fa05ad5346c4730fe1bc07447d SHA512 fd1599032a4e00450a0038e1f8851caea625cc5d178ed241fd14c123a69437601a7bfe792b8b2cd45881f67d6d60817ad7ed8fb43e940809983b32c049bdad4e WHIRLPOOL 5d2d697f63cb4444157436808a01c3a3a224d92915ef4d8aff43efca7c62f557496dd92a3cecfc5fd581e48318152b66fa99873c11f90a67b6d240a2ac54c293
DIST btparser-0.18.tar.xz 343068 SHA256 e209165c43c8852692c513e84212622338e83cf7766344a48fbcfaa027f7a0e2 SHA512 dd5d9fbe1a353aad85e22b9456bf08c835b2011daf229cb37fe3e25b095a9e6f6708d302a7bfa3e1a3865383bcdfab207e8a4a0854024354c3058b1d1e3bf0aa WHIRLPOOL af207c618ce69f75b9956586cd0b463c9ed117e4d20a6204db4d6a76dc465cd6dc90fb1c714dcdb516a60a609ab96e2266986b35490b2ec76a34d558c4624d53
DIST btparser-0.19.tar.xz 343252 SHA256 1e25c9409c6a40cf186c5c1d965a80ba73d09326c26e712695c6c4f1733b8e49 SHA512 2aa12c56ad9924f2220f0988e545f13ed36e5833cef93b414a92cbdec31304a879e67347129d931f402387f76389ad7fd09817209bd3fbb286991947a5b816d6 WHIRLPOOL af60fe95ad5bd64272fcc2a5506df4744b62708a2a072f592c3f8cdb7a01a9151b4c5be4e554658bd6cbd649a769f1f7ecf51cf1f5f13f0998da75a8fb70fd79
DIST btparser-0.24.tar.xz 353700 SHA256 9cc1e172c864afb6dec45850ed7b2fa605d39013918027df81800899ea654e32 SHA512 3aee4a8cbc8cda7017cc7203b670ba30443b5f302d728ecb7ce06a9569367543669c9c02d10a71b2bbf0bbc65cb927c0e25a53a422fc3be5e4a2ee51e5495198 WHIRLPOOL a5feb168f9ab2d4442c37ba388c0ed4708781ab2e6becc89ea20ac2601a698600e47721c0818aad8e4df93888cfadfdec68aace0f659985d95cecb31cdb01b8f

@ -1,55 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/btparser/btparser-0.16.ebuild,v 1.3 2012/03/15 18:09:33 phajdan.jr Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
inherit python
DESCRIPTION="Parser and analyzer for backtraces produced by gdb"
HOMEPAGE="https://fedorahosted.org/btparser/"
SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="static-libs"
RDEPEND=""
DEPEND="${RDEPEND}
app-arch/xz-utils"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
python_clean_py-compile_files
}
src_configure() {
# Configure checks for python.pc; our python-2.7 installs python-2.7.pc,
# while python-2.6 does not install any pkgconfig file.
export PYTHON_CFLAGS=$(python-config --includes)
export PYTHON_LIBS=$(python-config --libs)
econf \
$(use_enable static-libs static) \
--disable-maintainer-mode
}
src_install() {
default
find "${D}" -name '*.la' -exec rm -f {} +
}
pkg_postinst() {
python_mod_optimize btparser
}
pkg_postrm() {
python_mod_cleanup btparser
}

@ -1,18 +1,18 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/btparser/btparser-0.18.ebuild,v 1.1 2012/09/15 11:34:02 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/btparser/btparser-0.24.ebuild,v 1.1 2012/12/24 20:45:35 pacho Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit python
inherit eutils python-single-r1
DESCRIPTION="Parser and analyzer for backtraces produced by gdb"
HOMEPAGE="https://fedorahosted.org/btparser/"
SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
SLOT="0/2"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs"
@ -20,15 +20,6 @@ RDEPEND=">=dev-libs/glib-2.21:2"
DEPEND="${RDEPEND}
app-arch/xz-utils"
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
python_clean_py-compile_files
}
src_configure() {
# Configure checks for python.pc; our python-2.7 installs python-2.7.pc,
# while python-2.6 does not install any pkgconfig file.
@ -42,13 +33,5 @@ src_configure() {
src_install() {
default
find "${D}" -name '*.la' -exec rm -f {} +
}
pkg_postinst() {
python_mod_optimize btparser
}
pkg_postrm() {
python_mod_cleanup btparser
prune_libtool_files --modules
}

@ -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-libs/fddl/fddl-20111124.ebuild,v 1.2 2012/12/16 10:36:36 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/fddl/fddl-20111124.ebuild,v 1.3 2012/12/25 04:10:41 jdhore Exp $
EAPI=4
@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
DOCS=( AUTHORS ChangeLog INSTALL RELEASE )

@ -0,0 +1,119 @@
2010-07-27 Magnus Granberg <zorry@gentoo.org>
#236054
tests/Makefile.in add -nopie to CFLAGS
test/misc/Makefile.in likewise
test/mpbsd/Makefile.in likewise
test/mpf/Makefile.in likewise
test/mpn/Makefile.in likewise
test/mpq/Makefile.in likewise
test/mpz/Makefile.in likewise
test/randMakefile.in likewise
test/cxx/Makefile.in likewise and CXXFLAGS
--- a/tests/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/devel/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/devel/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/misc/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/misc/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/mpf/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/mpf/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/mpn/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/mpn/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/mpq/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/mpq/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/mpz/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/mpz/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/rand/Makefile.in 2010-07-27 00:53:05.000000000 +0000
+++ b/tests/rand/Makefile.in 2010-07-27 00:35:10.000000000 +0000
@@ -200,7 +200,7 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
--- a/tests/cxx/Makefile.in 2010-02-06 12:43:21.000000000 +0000
+++ b/tests/cxx/Makefile.in 2010-07-27 01:31:43.000000000 +0000
@@ -189,13 +189,13 @@
CC = @CC@
CCAS = @CCAS@
CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -nopie
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
CXX = @CXX@
CXXCPP = @CXXCPP@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ -nopie
CYGPATH_W = @CYGPATH_W@
DEFN_LONG_LONG_LIMB = @DEFN_LONG_LONG_LIMB@
DEFS = @DEFS@

@ -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-libs/gmp/gmp-5.1.0.ebuild,v 1.1 2012/12/20 03:08:09 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.0.ebuild,v 1.2 2012/12/24 18:49:45 vapier Exp $
inherit flag-o-matic eutils libtool unpacker toolchain-funcs
@ -33,7 +33,7 @@ src_unpack() {
# disable -fPIE -pie in the tests for x86 #236054
if use x86 && gcc-specs-pie ; then
epatch "${FILESDIR}"/${PN}-5.0.1-x86-nopie-tests.patch
epatch "${FILESDIR}"/${PN}-5.1.0-x86-nopie-tests.patch
fi
# note: we cannot run autotools here as gcc depends on this package

@ -1,2 +1,2 @@
DIST hcs_utils-1.1.1.tar.gz 7044 SHA256 9e9b44c8902d9064c19ddc119eb27c60317ec76863b2189ad5faf0867a5870b1 SHA512 570ab73c41117685b6afe79d798e0f8b2e885ffa8f9027e9189b8a99f55b5f0bfd68f7a951fa97c4beaf3013c65544e4ba3a8351dd312a867a45c5446a4dbdf0 WHIRLPOOL b7971e8f86738a551de75c787e1e00125f6e225c88129a5227937a7410c3cbc37e5758bd9a6ecf50c7afd47c5c04e0cb053aa0d37c6ed1e4ea87632d789fa44a
DIST hcs_utils-1.2.tar.gz 10025 SHA256 f342d9712709cdcf1bb58750bf9573cc89cff20c47f4aaee8d9e2f53af3897d0 SHA512 382c2b27aa8dd4b5bb6f344c04a19e339dea8efc974e019202f1a37173da4399326db2ce1a1b0b45dbc56995101f78fa5123d01cfea5a50168b66ac043ee4ba4 WHIRLPOOL 7ec033a08fb2122fc38427eb09be598654a7b74a1e15fd3ecfe55c953c2c13b288c7cbd662a166bd74e8e11c33fa28f28821be47dff33dbb590c0ab0afad579d
DIST hcs_utils-1.3.tar.gz 21999 SHA256 b03fe7fc1fc3877ec810297bfc550f7cce58cf1f62bc464e348846ad01739255 SHA512 49f7096c339463dde586592ac06dea6f7e3a955c42ab5bd49341ac276d727c7033fa3c17f36d1268ade3d6661fd123ce9a49ba47fbf855ea13d2ab2b46888a27 WHIRLPOOL f00125e833f1575a6e3c9a873eead83275e27c07d469131cefcb79e834f7e59b66426c87e3588e5a192360737ede02be6d26879cedf8d784fba11cf7438f2bfd

@ -1,11 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.1.1.ebuild,v 1.1 2010/08/29 18:52:39 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.3.ebuild,v 1.1 2012/12/25 04:41:56 floppym Exp $
EAPI="2"
PYTHON_DEPEND="2:2.5"
SUPPORT_PYTHON_ABIS="1"
inherit distutils
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="A library containing some useful snippets"
HOMEPAGE="http://pypi.python.org/pypi/hcs_utils"
@ -14,10 +14,15 @@ SRC_URI="mirror://pypi/h/${PN/-/_}/${P/-/_}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
RDEPEND=""
RESTRICT_PYTHON_ABIS="3.*"
S="${WORKDIR}/${P/-/_}"
python_test() {
cd "${BUILD_DIR}/lib" || die
py.test --doctest-modules hcs_utils || die
}

@ -0,0 +1,32 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.2-r1.ebuild,v 1.1 2012/12/24 21:37:51 mgorny Exp $
EAPI=5
PYTHON_REQ_USE="tk?"
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
MY_PN="PyOpenGL"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python OpenGL bindings"
HOMEPAGE="http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
# mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="tk"
RDEPEND="media-libs/freeglut
virtual/opengl
x11-libs/libXi
x11-libs/libXmu
tk? ( dev-tcltk/togl )"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}"

@ -31,7 +31,7 @@ index e1f877a..80f6af1 100644
import System.Directory ( createDirectory )
-import System.IO.Error ( try, isAlreadyExistsError )
+import qualified Control.Exception as E
+import qualified System.IO.Error as E
+import qualified System.IO.Error as E ( isAlreadyExistsError )
import Utils
import CF

@ -1,4 +1,2 @@
DIST darcs-2.4.4.tar.gz 1193126 SHA256 97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e SHA512 6b611b80c8d14b5784fc11efbf1da6a8377f9d8eca8a1607073fc751d35d42f5097556497c970da1b22900a1c80d76303538223803f4fd6699bb847dc2c4cc36 WHIRLPOOL 5ce62a807bfc8795fc3a4ead6edcea464e55f8ae092b26fff3f761ca416e0db1eeac2ea48b50f2d493f858dcac68806e16d1b7e277de5702a50f0fa53ae838ba
DIST darcs-2.5.2.tar.gz 1231903 SHA256 8953f9d64f8013876466b8ad5474a212ee4e164f419ba4012b5dcc9e590fb386 SHA512 6203f7280436a15e94dc0744d8a7d24bc61f9c2f4bc32a7f29d38172b3e3c093aedf19b6931330d0aeb0a9aa907f4de6ba88ff01968fc5f86858ff9468f9d237 WHIRLPOOL f92bf86caffcc296f8ac4bcaf9fe7772f0c41050417b1b6143706af7c36cb9f31665cdfa87ef1af522800e6d659a9cc0c1d6a25e757be7d81c66ac42eaaa2813
DIST darcs-2.8.0.tar.gz 1297733 SHA256 1415c2a1a99db8cf76d5f31f6a3490a2a9d3e13f2abfcc67fc108885cf52ce83 SHA512 a944afad043a4ec21a88f090c7678dfc6790c1fd3ee07e8a10a63e0ee23de05460c585a0b542bf47c2fe1a007125da86c1a45db198b425f866b198eb6b4dcf64 WHIRLPOOL 10eba204757ec859b764cab4f4e2260d67d948f97d2b01c7b4bfc2952f218b9dc0575760e27ce02ba0844e1193a987036a69e6696a7e725ac66a44779bc718d7
DIST darcs-2.8.3.tar.gz 1289187 SHA256 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59 SHA512 2cb997146077668b082e1302a54f728539c33088a42c034de10b0a87f00b49a95405feeaff58f601265c880f92d5b5fb37a041bb4fbf26c36f6964c0a3a40996 WHIRLPOOL 895a46c8a6d6dae8da9f094f881f830e17613359f3bddfb6d6f08bd11112c796a1139671795729c6e1c58f19f353f35172de5ccc89553698a882d266b1d4e90f

@ -1,146 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.18 2012/09/12 16:10:06 qnikst Exp $
EAPI="3"
CABAL_FEATURES="bin lib profile haddock hscolour"
inherit haskell-cabal eutils bash-completion-r1
DESCRIPTION="a distributed, interactive, smart revision control system"
HOMEPAGE="http://darcs.net/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc test"
# Dependency notes:
# 1) Use a cunning trick for hashed-storage, haskeline, regex-compat
# where the min bound is the lowest version available.
# 2) Do the opposite for zlib: highest not available.
# 3) Prefer curl over HTTP since darcs uses an old version of HTTP.
# 4) Use the same bounds for mmap as hashed-storage.
COMMONDEPS=">=dev-lang/ghc-6.8
>=dev-haskell/hashed-storage-0.4.13[profile?]
=dev-haskell/haskeline-0.6*[profile?]
=dev-haskell/html-1.0*[profile?]
=dev-haskell/mmap-0.4*[profile?]
<dev-haskell/mtl-1.2[profile?]
>=dev-haskell/network-2.2[profile?]
>=dev-haskell/parsec-2.0[profile?]
<dev-haskell/regex-compat-0.94[profile?]
=dev-haskell/terminfo-0.3*[profile?]
=dev-haskell/utf8-string-0.3*[profile?]
<dev-haskell/zlib-0.6.0.0[profile?]
net-misc/curl"
DEPEND="${COMMONDEPS}
>=dev-haskell/cabal-1.6
virtual/pkgconfig
doc? ( virtual/latex-base
dev-tex/latex2html )
test? ( dev-haskell/test-framework[profile?]
dev-haskell/test-framework-hunit[profile?]
dev-haskell/test-framework-quickcheck2[profile?] )
"
# darcs also has a library version; we thus need $DEPEND
RDEPEND="${COMMONDEPS}
virtual/mta"
pkg_setup() {
if use doc && ! built_with_use -o dev-tex/latex2html png gif; then
eerror "Building darcs with USE=\"doc\" requires that"
eerror "dev-tex/latex2html is built with at least one of"
eerror "USE=\"png\" and USE=\"gif\"."
die "USE=doc requires dev-tex/latex2html with USE=\"png\" or USE=\"gif\""
fi
}
src_prepare() {
pushd "contrib"
epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
popd
epatch "${FILESDIR}/${P}-issue1770-curl_multi_perform-no-running-handles.patch"
epatch "${FILESDIR}/${P}-tests-emailformat.patch"
# Loosen dependency on hashed-storage
sed -i -e "s/hashed-storage == 0.4.13/hashed-storage == 0.4.*/" \
"${S}/${PN}.cabal" \
|| die "Could not loosen deps on hashed-storage"
# Loosen dependency on parsec
sed -i -e "s/parsec >= 2.0 && < 3.1/parsec >= 2.0/" \
"${S}/${PN}.cabal" \
|| die "Could not loosen deps on parsec"
# and on network
sed -i -e 's/network == 2\.2\.\*/network >= 2.2/' \
"${S}/${PN}.cabal"
# hlint tests tend to break on every newly released hlint
rm "${S}/tests/haskell_policy.sh" || die
rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
}
src_configure() {
# checking whether ghc supports -threaded flag
# Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
# contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
# It might have interactivity impact.
threaded_flag=""
if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
threaded_flag="--flags=threaded"
einfo "$P will be built with threads support"
else
threaded_flag="--flags=-threaded"
einfo "$P will be built without threads support"
fi
# Use curl for net stuff to avoid strict version dep on HTTP and network
cabal_src_configure \
--flags=curl \
--flags=-http \
--flags=curl-pipelining \
--flags=color \
--flags=terminfo \
--flags=mmap \
$threaded_flag \
$(cabal_flag test)
}
src_test() {
# run cabal test from haskell-cabal
haskell-cabal_src_test || die "cabal test failed"
# run the unit tests (not part of cabal test for some reason...)
# breaks the cabal abstraction a bit...
"${S}/dist/build/unit/unit" || die "unit tests failed"
}
src_install() {
cabal_src_install
newbashcomp "${S}/contrib/darcs_completion" "${PN}"
rm "${ED}/usr/bin/unit" 2> /dev/null
# fixup perms in such an an awkward way
mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
# if tests were enabled, make sure the unit test driver is deleted
rm -rf "${ED}/usr/bin/unit"
}
pkg_postinst() {
ghc-package_pkg_postinst
ewarn "NOTE: in order for the darcs send command to work properly,"
ewarn "you must properly configure your mail transport agent to relay"
ewarn "outgoing mail. For example, if you are using ssmtp, please edit"
ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
}

@ -1,126 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r1.ebuild,v 1.6 2012/09/12 16:10:06 qnikst Exp $
EAPI="4"
CABAL_FEATURES="bin lib profile haddock hscolour"
inherit haskell-cabal eutils bash-completion-r1
DESCRIPTION="a distributed, interactive, smart revision control system"
HOMEPAGE="http://darcs.net/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc test"
RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
=dev-haskell/haskeline-0.6*[profile?]
=dev-haskell/html-1.0*[profile?]
<dev-haskell/http-4000.3[profile?]
=dev-haskell/mmap-0.5*[profile?]
<dev-haskell/mtl-2.1[profile?]
>=dev-haskell/network-2.2[profile?]
<dev-haskell/parsec-3.2[profile?]
=dev-haskell/random-1.0*[profile?]
<dev-haskell/regex-compat-0.96[profile?]
=dev-haskell/tar-0.3*[profile?]
=dev-haskell/terminfo-0.3*[profile?]
=dev-haskell/text-0.11*[profile?]
<dev-haskell/zlib-0.6.0.0[profile?]
>=dev-lang/ghc-6.10.1
net-misc/curl
virtual/mta"
# darcs also has a library version; we thus need $DEPEND
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
doc? ( virtual/latex-base
|| ( dev-tex/latex2html[png]
dev-tex/latex2html[gif]
)
)
test? ( dev-haskell/test-framework[profile?]
dev-haskell/test-framework-hunit[profile?]
dev-haskell/test-framework-quickcheck2[profile?]
)
"
src_prepare() {
cd "${S}/contrib"
epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
cd ..
epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch"
epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch"
epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch"
epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch"
epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch"
# hlint tests tend to break on every newly released hlint
rm "${S}/tests/haskell_policy.sh"
rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
# use a more recent API, and thus depend on a more recent package
sed -i -e "s/findBy/find/" "${S}/src/Darcs/Test/Patch/Info.hs" || die "sed s/findBy/find/ not necessary"
}
src_configure() {
# checking whether ghc supports -threaded flag
# Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
# contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
# It might have interactivity impact.
threaded_flag=""
if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
threaded_flag="--flags=threaded"
einfo "$P will be built with threads support"
else
threaded_flag="--flags=-threaded"
einfo "$P will be built without threads support"
fi
# Use curl for net stuff to avoid strict version dep on HTTP and network
cabal_src_configure \
--flags=curl \
--flags=-http \
--flags=curl-pipelining \
--flags=color \
--flags=terminfo \
--flags=mmap \
$threaded_flag \
$(cabal_flag test)
}
src_test() {
# run cabal test from haskell-cabal
haskell-cabal_src_test || die "cabal test failed"
# run the unit tests (not part of cabal test for some reason...)
# breaks the cabal abstraction a bit...
"${S}/dist/build/unit/unit" || die "unit tests failed"
}
src_install() {
cabal_src_install
newbashcomp "${S}/contrib/darcs_completion" "${PN}"
rm "${ED}/usr/bin/unit" 2> /dev/null
# fixup perms in such an an awkward way
mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
# if tests were enabled, make sure the unit test driver is deleted
rm -rf "${ED}/usr/bin/unit"
}
pkg_postinst() {
ghc-package_pkg_postinst
ewarn "NOTE: in order for the darcs send command to work properly,"
ewarn "you must properly configure your mail transport agent to relay"
ewarn "outgoing mail. For example, if you are using ssmtp, please edit"
ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
}

@ -1,127 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r2.ebuild,v 1.3 2012/09/12 16:10:06 qnikst Exp $
EAPI="4"
CABAL_FEATURES="bin lib profile haddock hscolour"
inherit haskell-cabal eutils bash-completion-r1
DESCRIPTION="a distributed, interactive, smart revision control system"
HOMEPAGE="http://darcs.net/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc test"
RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
=dev-haskell/haskeline-0.6*[profile?]
=dev-haskell/html-1.0*[profile?]
<dev-haskell/http-4000.3[profile?]
=dev-haskell/mmap-0.5*[profile?]
<dev-haskell/mtl-2.2[profile?]
>=dev-haskell/network-2.2[profile?]
<dev-haskell/parsec-3.2[profile?]
=dev-haskell/random-1.0*[profile?]
<dev-haskell/regex-compat-0.96[profile?]
=dev-haskell/tar-0.3*[profile?]
=dev-haskell/terminfo-0.3*[profile?]
=dev-haskell/text-0.11*[profile?]
<dev-haskell/zlib-0.6.0.0[profile?]
>=dev-lang/ghc-6.10.1
net-misc/curl
virtual/mta"
# darcs also has a library version; we thus need $DEPEND
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
doc? ( virtual/latex-base
|| ( dev-tex/latex2html[png]
dev-tex/latex2html[gif]
)
)
test? ( dev-haskell/test-framework[profile?]
dev-haskell/test-framework-hunit[profile?]
dev-haskell/test-framework-quickcheck2[profile?]
)
"
src_prepare() {
cd "${S}/contrib"
epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
cd ..
epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch"
epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch"
epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch"
epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch"
epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch"
epatch "${FILESDIR}/${PN}-2.5.2-mtl-2.1.patch"
# hlint tests tend to break on every newly released hlint
rm "${S}/tests/haskell_policy.sh"
rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
# use a more recent API, and thus depend on a more recent package
sed -i -e "s/findBy/find/" "${S}/src/Darcs/Test/Patch/Info.hs" || die "sed s/findBy/find/ not necessary"
}
src_configure() {
# checking whether ghc supports -threaded flag
# Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
# contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
# It might have interactivity impact.
threaded_flag=""
if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
threaded_flag="--flags=threaded"
einfo "$P will be built with threads support"
else
threaded_flag="--flags=-threaded"
einfo "$P will be built without threads support"
fi
# Use curl for net stuff to avoid strict version dep on HTTP and network
cabal_src_configure \
--flags=curl \
--flags=-http \
--flags=curl-pipelining \
--flags=color \
--flags=terminfo \
--flags=mmap \
$threaded_flag \
$(cabal_flag test)
}
src_test() {
# run cabal test from haskell-cabal
haskell-cabal_src_test || die "cabal test failed"
# run the unit tests (not part of cabal test for some reason...)
# breaks the cabal abstraction a bit...
"${S}/dist/build/unit/unit" || die "unit tests failed"
}
src_install() {
cabal_src_install
newbashcomp "${S}/contrib/darcs_completion" "${PN}"
rm "${ED}/usr/bin/unit" 2> /dev/null
# fixup perms in such an an awkward way
mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
# if tests were enabled, make sure the unit test driver is deleted
rm -rf "${ED}/usr/bin/unit"
}
pkg_postinst() {
ghc-package_pkg_postinst
ewarn "NOTE: in order for the darcs send command to work properly,"
ewarn "you must properly configure your mail transport agent to relay"
ewarn "outgoing mail. For example, if you are using ssmtp, please edit"
ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
}

@ -1,18 +0,0 @@
diff -urwpN darcs-1.0.9-orig/darcs_completion darcs-1.0.9/darcs_completion
--- darcs-1.0.9-orig/darcs_completion 2007-06-07 21:42:57.000000000 +0200
+++ darcs-1.0.9/darcs_completion 2007-06-07 21:43:12.000000000 +0200
@@ -3,7 +3,6 @@
# darcs command line completion.
# Copyright 2002 "David Roundy" <droundy@abridgegame.org>
#
-have darcs &&
_darcs()
{
local cur
@@ -48,5 +47,5 @@ _darcs()
return 0
}
-[ "$have" ] && complete -F _darcs -o default darcs
+complete -F _darcs -o default darcs

@ -1,38 +0,0 @@
Fri Apr 16 00:47:39 CEST 2010 Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
* Fix hscurl.c when URL is downloaded during the first call to curl_multi_perform.
Turns out that the first call to curl_multi_perform() can fetch the URL or
result in error. I can easily reproduce this using HTTP server on localhost.
This means that situation when running_handles is zero is valid, so remove the
error and handle it correctly.
diff -rN -u old-darcs.net/src/hscurl.c new-darcs.net/src/hscurl.c
--- old-darcs.net/src/hscurl.c 2010-06-28 19:35:56.382397912 +0200
+++ new-darcs.net/src/hscurl.c 2010-06-28 19:35:57.544398155 +0200
@@ -19,7 +19,6 @@
RESULT_MULTI_INIT_FAIL,
RESULT_EASY_INIT_FAIL,
RESULT_SLIST_APPEND_FAIL,
- RESULT_NO_RUNNING_HANDLES,
RESULT_MULTI_INFO_READ_FAIL,
RESULT_UNKNOWN_MESSAGE,
RESULT_FILE_OPEN_FAIL
@@ -33,7 +32,6 @@
"curl_multi_init() failed",
"curl_easy_init() failed",
"curl_slist_append() failed",
- "curl_multi_perform() - no running handles",
"curl_multi_info_read() failed",
"curl_multi_info_read() returned unknown message",
"fopen() failed"
@@ -67,11 +65,9 @@
error = curl_multi_perform(multi, &running_handles);
if (error != CURLM_OK && error != CURLM_CALL_MULTI_PERFORM)
return curl_multi_strerror(error);
- if (running_handles == 0)
- return error_strings[RESULT_NO_RUNNING_HANDLES];
running_handles_last = running_handles;
- while (1)
+ while (running_handles_last > 0)
{
while (error == CURLM_CALL_MULTI_PERFORM)
error = curl_multi_perform(multi, &running_handles);

@ -1,39 +0,0 @@
Tue Nov 16 23:36:37 EET 2010 Sergei Trofimovich <slyfox@community.haskell.org>
* tests/emailformat.sh: use ghc --make instead of ghci
linux-alpha and linux-ia64 don't have ghci support.
No need to fail there.
diff -rN -u old-darcs.net/tests/emailformat.sh new-darcs.net/tests/emailformat.sh
--- old-darcs.net/tests/emailformat.sh 2010-11-16 23:40:10.207480789 +0200
+++ new-darcs.net/tests/emailformat.sh 2010-11-16 23:40:10.706480789 +0200
@@ -6,8 +6,10 @@
switch_to_latin9_locale
rm -rf temp1
rm -rf temp2
+rm -rf temp3
mkdir temp1
mkdir temp2
+mkdir temp3
cd temp1
seventysevenaddy="<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bbbbbbbbbb.cccccccccc.abrasoft.com>"
@@ -34,10 +36,17 @@
grep $seventysevenaddy mail_as_file
# Check that there are no non-ASCII characters in the mail
-ghc -e 'getContents >>= return . not . any (> Data.Char.chr 127)' < mail_as_file | grep '^True$'
+cd ../temp3
+cat > is_ascii.hs <<EOF
+import Data.Char (chr)
+main = getContents >>= print . not . any (> Data.Char.chr 127)
+EOF
+
+ghc --make is_ascii.hs -o is_ascii
+./is_ascii < ../temp1/mail_as_file | grep '^True$'
cd ..
rm -rf temp1
rm -rf temp2
-
+rm -rf temp3

@ -1,142 +0,0 @@
diff --git a/Distribution/ShellHarness.hs b/Distribution/ShellHarness.hs
index 78a8a9b..949b752 100644
--- a/Distribution/ShellHarness.hs
+++ b/Distribution/ShellHarness.hs
@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getEnvironment )
import System.Exit ( ExitCode (..) )
import System.FilePath
import System.IO
-import System( system )
import System.Process ( ProcessHandle,
runInteractiveProcess, waitForProcess,
- getProcessExitCode )
+ getProcessExitCode, system )
import Data.Maybe
import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf )
import Control.Concurrent
diff --git a/darcs.cabal b/darcs.cabal
index 887a27b..56e36fa 100644
--- a/darcs.cabal
+++ b/darcs.cabal
@@ -124,7 +124,7 @@ Executable witnesses
else
buildable: True
- build-tools: ghc >= 6.10 && < 7.2
+ build-tools: ghc >= 6.10 && < 7.4
hs-source-dirs: src
include-dirs: src
@@ -182,7 +182,7 @@ Executable witnesses
text == 0.11.*,
old-time == 1.0.*,
directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
+ process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
array >= 0.1 && < 0.4,
random == 1.0.*,
@@ -192,7 +192,7 @@ Executable witnesses
test-framework >= 0.2.2,
test-framework-quickcheck2 >= 0.2.2
if !os(windows)
- build-depends: unix >= 1.0 && < 2.5
+ build-depends: unix >= 1.0 && < 2.6
if flag(http)
build-depends: network >= 2.2 && < 2.4,
HTTP >= 3000.0 && < 4000.2
@@ -208,7 +208,7 @@ Library
else
buildable: True
- build-tools: ghc >= 6.10 && < 7.2
+ build-tools: ghc >= 6.10 && < 7.4
hs-source-dirs: src
include-dirs: src
@@ -385,14 +385,14 @@ Library
tar == 0.3.*
if !os(windows)
- build-depends: unix >= 1.0 && < 2.5
+ build-depends: unix >= 1.0 && < 2.6
build-depends: base >= 3,
bytestring >= 0.9.0 && < 0.10,
text == 0.11.*,
old-time == 1.0.*,
directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
+ process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
array >= 0.1 && < 0.4,
random == 1.0.*
@@ -483,7 +483,7 @@ Executable darcs
src/umask.c
src/Crypt/sha2.c
- build-tools: ghc >= 6.10 && < 7.2
+ build-tools: ghc >= 6.10 && < 7.4
-- We need optimizations, regardless of what Hackage says
-- Note: "if true" works around a cabal bug with order of flag composition
@@ -533,14 +533,14 @@ Executable darcs
tar == 0.3.*
if !os(windows)
- build-depends: unix >= 1.0 && < 2.5
+ build-depends: unix >= 1.0 && < 2.6
build-depends: base >= 3,
bytestring >= 0.9.0 && < 0.10,
text == 0.11.*,
old-time == 1.0.*,
directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
+ process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
array >= 0.1 && < 0.4,
random == 1.0.*
@@ -615,7 +615,7 @@ Executable unit
else
buildable: True
- build-tools: ghc >= 6.10 && < 7.2
+ build-tools: ghc >= 6.10 && < 7.4
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
@@ -678,7 +678,7 @@ Executable unit
cc-options: -DHAVE_SIGINFO_H
if !os(windows)
- build-depends: unix >= 1.0 && < 2.5
+ build-depends: unix >= 1.0 && < 2.6
build-depends: base >= 3,
bytestring >= 0.9.0 && < 0.10,
@@ -686,7 +686,7 @@ Executable unit
text == 0.11.*,
old-time == 1.0.*,
directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
+ process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
array >= 0.1 && < 0.4,
hashed-storage >= 0.5.2 && < 0.6,
diff --git a/src/Darcs/RepoPath.hs b/src/Darcs/RepoPath.hs
index aa00156..8c5432b 100644
--- a/src/Darcs/RepoPath.hs
+++ b/src/Darcs/RepoPath.hs
@@ -60,11 +60,9 @@ import qualified Darcs.Patch.FileName as PatchFileName ( FileName, fp2fn, fn2fp
#include "impossible.h"
class FilePathOrURL a where
- {-# INLINE toPath #-}
toPath :: a -> String
class FilePathOrURL a => FilePathLike a where
- {-# INLINE toFilePath #-}
toFilePath :: a -> FilePath
-- | Paths which are relative to the local darcs repository and normalized.

@ -1,139 +0,0 @@
--- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:44:08.644140399 +1100
+++ darcs-2.5.2/darcs.cabal 2011-12-24 10:03:14.325396692 +1100
@@ -124,7 +124,7 @@
else
buildable: True
- build-tools: ghc >= 6.10 && < 7.4
+ build-tools: ghc >= 6.10 && < 7.6
hs-source-dirs: src
include-dirs: src
@@ -174,17 +174,17 @@
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
- filepath >= 1.1.0.0 && < 1.3.0.0,
+ filepath >= 1.1.0.0 && < 1.5.0.0,
haskeline >= 0.6.2.2 && < 0.7,
hashed-storage >= 0.5.2 && < 0.6,
base >= 3,
bytestring >= 0.9.0 && < 0.10,
text == 0.11.*,
- old-time == 1.0.*,
+ old-time >= 1.0 && < 1.2,
directory >= 1.0.0.0 && < 1.2.0.0,
process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
+ array >= 0.1 && < 0.5,
random == 1.0.*,
tar == 0.3.*,
zlib >= 0.5.1.0 && < 0.6.0.0,
@@ -208,7 +208,7 @@
else
buildable: True
- build-tools: ghc >= 6.10 && < 7.4
+ build-tools: ghc >= 6.10 && < 7.6
hs-source-dirs: src
include-dirs: src
@@ -379,7 +379,7 @@
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
- filepath >= 1.1.0.0 && < 1.3.0.0,
+ filepath >= 1.1.0.0 && < 1.5.0.0,
haskeline >= 0.6.2.2 && < 0.7,
hashed-storage >= 0.5.2 && < 0.6,
tar == 0.3.*
@@ -390,11 +390,11 @@
build-depends: base >= 3,
bytestring >= 0.9.0 && < 0.10,
text == 0.11.*,
- old-time == 1.0.*,
+ old-time >= 1.0 && < 1.2,
directory >= 1.0.0.0 && < 1.2.0.0,
process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
+ array >= 0.1 && < 0.5,
random == 1.0.*
@@ -483,7 +483,7 @@
src/umask.c
src/Crypt/sha2.c
- build-tools: ghc >= 6.10 && < 7.4
+ build-tools: ghc >= 6.10 && < 7.6
-- We need optimizations, regardless of what Hackage says
-- Note: "if true" works around a cabal bug with order of flag composition
@@ -527,7 +527,7 @@
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
- filepath >= 1.1.0.0 && < 1.3.0.0,
+ filepath >= 1.1.0.0 && < 1.5.0.0,
haskeline >= 0.6.2.2 && < 0.7,
hashed-storage >= 0.5.2 && < 0.6,
tar == 0.3.*
@@ -538,11 +538,11 @@
build-depends: base >= 3,
bytestring >= 0.9.0 && < 0.10,
text == 0.11.*,
- old-time == 1.0.*,
+ old-time >= 1.0 && < 1.2,
directory >= 1.0.0.0 && < 1.2.0.0,
process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
+ array >= 0.1 && < 0.5,
random == 1.0.*
if flag(curl)
@@ -615,7 +615,7 @@
else
buildable: True
- build-tools: ghc >= 6.10 && < 7.4
+ build-tools: ghc >= 6.10 && < 7.6
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
@@ -623,7 +623,7 @@
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
- filepath >= 1.1.0.0 && < 1.3.0.0,
+ filepath >= 1.1.0.0 && < 1.5.0.0,
QuickCheck >= 2.1.0.0,
HUnit >= 1.0,
test-framework >= 0.2.2,
@@ -684,11 +684,11 @@
bytestring >= 0.9.0 && < 0.10,
haskeline >= 0.6.2.2 && < 0.7,
text == 0.11.*,
- old-time == 1.0.*,
+ old-time >= 1.0 && < 1.2,
directory >= 1.0.0.0 && < 1.2.0.0,
process >= 1.0 && < 1.2,
containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
+ array >= 0.1 && < 0.5,
hashed-storage >= 0.5.2 && < 0.6,
random == 1.0.*
--- darcs-2.5.2-orig/src/Darcs/Utils.hs 2011-03-14 09:40:46.000000000 +1100
+++ darcs-2.5.2/src/Darcs/Utils.hs 2011-12-24 10:07:16.125342597 +1100
@@ -62,7 +62,7 @@
, TreeMonad, tree )
import Storage.Hashed.Tree( Tree, listImmediate, findTree )
-showHexLen :: (Integral a) => Int -> a -> String
+showHexLen :: (Integral a, Show a) => Int -> a -> String
showHexLen n x = let s = showHex x ""
in replicate (n - length s) ' ' ++ s

@ -1,38 +0,0 @@
--- darcs-2.5.2-orig/darcs.cabal 2012-04-12 00:35:07.075608173 +1000
+++ darcs-2.5.2/darcs.cabal 2012-04-12 00:40:06.173429235 +1000
@@ -171,7 +171,7 @@
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
+ mtl >= 1.0 && < 2.2,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
filepath >= 1.1.0.0 && < 1.5.0.0,
@@ -376,7 +376,7 @@
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
+ mtl >= 1.0 && < 2.2,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
filepath >= 1.1.0.0 && < 1.5.0.0,
@@ -524,7 +524,7 @@
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
+ mtl >= 1.0 && < 2.2,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
filepath >= 1.1.0.0 && < 1.5.0.0,
@@ -620,7 +620,7 @@
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
regex-compat >= 0.71 && < 0.96,
- mtl >= 1.0 && < 2.1,
+ mtl >= 1.0 && < 2.2,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
filepath >= 1.1.0.0 && < 1.5.0.0,

@ -1,38 +0,0 @@
--- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:43:28.551322710 +1100
+++ darcs-2.5.2/darcs.cabal 2011-12-19 20:44:08.644140399 +1100
@@ -195,7 +195,7 @@
build-depends: unix >= 1.0 && < 2.6
if flag(http)
build-depends: network >= 2.2 && < 2.4,
- HTTP >= 3000.0 && < 4000.2
+ HTTP >= 3000.0 && < 4000.3
-- ----------------------------------------------------------------------
@@ -420,7 +420,7 @@
if flag(http)
build-depends: network >= 2.2 && < 2.4,
- HTTP >= 3000.0 && < 4000.2
+ HTTP >= 3000.0 && < 4000.3
cpp-options: -DHAVE_HTTP
x-have-http:
@@ -554,7 +554,7 @@
if flag(http)
build-depends: network >= 2.2 && < 2.4,
- HTTP >= 3000.0 && < 4000.2
+ HTTP >= 3000.0 && < 4000.3
cpp-options: -DHAVE_HTTP
x-have-http:
@@ -705,7 +705,7 @@
if flag(http)
build-depends: network >= 2.2 && < 2.4,
- HTTP >= 3000.0 && < 4000.2
+ HTTP >= 3000.0 && < 4000.3
if flag(color)
x-use-color:

@ -1,69 +0,0 @@
diff -rN -u old-darcs-2.5.2/darcs.cabal new-darcs-2.5.2/darcs.cabal
--- old-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.079482374 +0200
+++ new-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.080482374 +0200
@@ -166,11 +166,11 @@
cpp-options: -DWIN32
c-sources: src/win32/send_email.c
build-depends: unix-compat >= 0.1.2,
- regex-posix >= 0.94.4 && < 0.95
+ regex-posix >= 0.94.4 && < 0.96
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
+ regex-compat >= 0.71 && < 0.96,
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
@@ -368,14 +368,14 @@
cpp-options: -DWIN32
c-sources: src/win32/send_email.c
build-depends: unix-compat >= 0.1.2,
- regex-posix >= 0.94.4 && < 0.95
+ regex-posix >= 0.94.4 && < 0.96
if os(solaris)
cc-options: -DHAVE_SIGINFO_H
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
+ regex-compat >= 0.71 && < 0.96,
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
@@ -516,14 +516,14 @@
cpp-options: -DWIN32
c-sources: src/win32/send_email.c
build-depends: unix-compat >= 0.1.2,
- regex-posix >= 0.94.4 && < 0.95
+ regex-posix >= 0.94.4 && < 0.96
if os(solaris)
cc-options: -DHAVE_SIGINFO_H
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
+ regex-compat >= 0.71 && < 0.96,
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
@@ -619,7 +619,7 @@
build-depends: base < 5,
extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
+ regex-compat >= 0.71 && < 0.96,
mtl >= 1.0 && < 2.1,
parsec >= 2.0 && < 3.2,
html == 1.0.*,
@@ -672,7 +672,7 @@
cpp-options: -DWIN32
c-sources: src/win32/send_email.c
build-depends: unix-compat >= 0.1.2,
- regex-posix >= 0.94.4 && < 0.95
+ regex-posix >= 0.94.4 && < 0.96
if os(solaris)
cc-options: -DHAVE_SIGINFO_H

@ -1,26 +0,0 @@
diff --git a/tests/hspwd.hs b/tests/hspwd.hs
index b93a7d5..f6fe2dd 100644
--- a/tests/hspwd.hs
+++ b/tests/hspwd.hs
@@ -1,5 +1,5 @@
module Main where
-import Directory ( getCurrentDirectory )
+import System.Directory ( getCurrentDirectory )
main = getCurrentDirectory >>= putStr
diff --git a/tests/trackdown-bisect-helper.hs b/tests/trackdown-bisect-helper.hs
index 5c325c4..7fcb4a4 100644
--- a/tests/trackdown-bisect-helper.hs
+++ b/tests/trackdown-bisect-helper.hs
@@ -15,8 +15,9 @@ patches with the linear implementation.
import Control.Monad
+import System.Environment
import System.IO
-import System
+import System.Process
import System.Random
import Data.List
import Control.Exception

@ -1,2 +1,3 @@
DIST gnome-applets-2.32.1.1.tar.bz2 10083534 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327 SHA512 2fa14922d55e24187714e3fc71e8b225a64efc1c7c10d33a7058cb8912a571abf1b545028604430a1fc5c75aa9202ee35f611ead2e435c6f1c532ca912792403 WHIRLPOOL 0528accfb0fc9f94407ae2b05656a51909f7e1976a713783687809989e65715d52b1530a637c185aa37958039b4b8dec3125c553c807a6b665f78c173ecf481e
DIST gnome-applets-3.4.1.tar.xz 8000232 SHA256 ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e SHA512 f7246082c019076504ded77212631acd8c325160c2ed58960ee8cc2d919b6e27c2bde9bd4104055a2257bbd5bb238b2cc3e528e694abde2068283c3aa44850a0 WHIRLPOOL 243efcf5d9baf8c0cb36a255563ae776e1b79de81fb41489626213d4f439e1c9c0c7c4f67194c85d2a379527711c4e330336dba2918bf3750e7422329c7ff0a3
DIST gnome-applets-3.6.0-unofficial.tar.xz 7899932 SHA256 92153757010c93c8b237d1ec868c0da1d8fd79d4b7cbad22849b95034fc81bae SHA512 d5941ba689469480ef2d77a16e9837bae39ef9906cee2fbb717bc5b0c421435fe465a3e82c60cb06a9bd4c91d22861e7e57b1d015cf08107c2a9fb47ada87145 WHIRLPOOL 2dfaf24c365895dd4168f1aecc55856006b548cc0a395380c34e93944d34ff68c4b18c6f3f63e008f5244daa624f599018db1ee8051aecd8f6140040b8e69277

@ -0,0 +1,116 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild,v 1.2 2012/12/24 17:17:33 eva Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="no" # bug 340725, no other la files
PYTHON_COMPAT=( python2_{6,7} )
inherit eutils gnome2 python-single-r1
DESCRIPTION="Applets for the GNOME Desktop and Panel"
HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
IUSE="gnome ipv6 networkmanager policykit"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
# 3.6 is tagged in upstream git, but the tarballs have not been uploaded :/
SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-unofficial.tar.xz"
# null applet still needs bonobo support for gnome-panel?
#
# Latest gnome-panel needed due to commit 45a4988a6
# atk, cairo, pango used in multiple applets
RDEPEND="
>=x11-libs/gtk+-3.0.0:3
dev-libs/atk
>=dev-libs/glib-2.22:2
>=gnome-base/gconf-2.8:2
>=gnome-base/gnome-panel-2.91.91
x11-libs/cairo
>=x11-libs/libxklavier-4
>=x11-libs/libwnck-2.91.0:3
>=x11-libs/libnotify-0.7:=
x11-libs/pango
>=sys-apps/dbus-1.1.2
>=dev-libs/dbus-glib-0.74
>=dev-libs/libxml2-2.5
>=x11-themes/gnome-icon-theme-2.15.91
>=dev-libs/libgweather-3.5:=
x11-libs/libX11
gnome? (
gnome-base/gnome-settings-daemon
>=gnome-extra/gucharmap-2.33.0:2.90
>=gnome-base/libgtop-2.11.92
${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}]
gnome-base/gconf[introspection]
gnome-base/gnome-panel[introspection]
x11-libs/gdk-pixbuf[introspection]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection] )
networkmanager? ( >=net-misc/networkmanager-0.7.0 )
policykit? ( >=sys-auth/polkit-0.92 )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xml-dtd:4.3
>=app-text/gnome-doc-utils-0.3.2
>=app-text/scrollkeeper-0.1.4
>=dev-util/intltool-0.35
dev-libs/libxslt
virtual/pkgconfig
"
src_prepare() {
# Remove silly check for pygobject:2
# https://bugzilla.gnome.org/show_bug.cgi?id=660550
sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
gnome2_src_prepare
}
src_configure() {
# We don't want HAL or battstat.
# mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d
# GNOME 3 has a hard-dependency on pulseaudio, so gstmixer applet is useless
G2CONF="${G2CONF}
--without-hal
--disable-battstat
--disable-mixer-applet
$(use_enable ipv6)
$(use_enable networkmanager)
$(use_enable policykit polkit)"
gnome2_src_configure
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
default
}
src_install() {
python_fix_shebang invest-applet
gnome2_src_install
local APPLETS="accessx-status charpick cpufreq drivemount geyes
gweather invest-applet mini-commander
multiload null_applet stickynotes trashapplet"
# mixer is out because gnome3 uses pulseaudio
# modemlights is out because it needs system-tools-backends-1
# battstat is disabled because we don't want HAL anywhere
for applet in ${APPLETS} ; do
docinto ${applet}
for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
done
done
}

@ -3,6 +3,6 @@
<pkgmetadata>
<herd>gnome</herd>
<use>
<flag name="cpufreq">Build cpu frequency scaling monitor applet</flag>
<flag name="cpufreq">Build cpu frequency scaling monitor applet</flag>
</use>
</pkgmetadata>

@ -1,4 +1,3 @@
DIST gcalctool-5.32.2.tar.bz2 1178049 RMD160 df98f5ff659f8abc877a20e146ea791b7411a8a2 SHA1 a894d910a45a20d4eab1cbd5d4277939145ec64c SHA256 b281cc545f27b37a0fd120366b1be517574d9f505b59dfc34f9860007df0b788
DIST gcalctool-6.2.0.tar.xz 999804 RMD160 9341e924cca8757caf4f6f5c0190ad0b3e8c7b50 SHA1 dc69bc1b65b29ce4e40263cfdac1c02602fc4bf3 SHA256 ddc2efe25220e9341832304dfd9e5e2390a70bb6bd70d1afeb49da88023cdffb
DIST gcalctool-6.4.1.1.tar.xz 1008540 RMD160 2f9f548d5196076d604eb8aaebc712da8fe4b042 SHA1 ffe41321d5b0a1b0e6331168e654d92fa75464b1 SHA256 6c166b1d0fec157e523caf82d6357c4a2f572cb21729272c9975003661b8c84e
DIST gcalctool-6.4.2.1.tar.xz 1009352 RMD160 ec0d3b722ba694bca159344c69836f60bf11f6b0 SHA1 808cdacb849a75e37c7cd0df418aa220c3cb93ed SHA256 d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8
DIST gcalctool-5.32.2.tar.bz2 1178049 SHA256 b281cc545f27b37a0fd120366b1be517574d9f505b59dfc34f9860007df0b788 SHA512 7685872b8668f5cf3aec8ca79352d9194d5a64c4d9f9cc8b462fd54715231f4a113c21cc1ea75911ebb3430f66fe13dc6a2747f3cc2caeb772b6b5887297768a WHIRLPOOL 43b8f58ed4be6d876fc648218ed267315561c28cb20489a8b76b23c7e121d2b5367822fb1d6841b76a4b2089ad9366ff75dac0ee2b55fd4c94530c15dafbbdbb
DIST gcalctool-6.4.2.1.tar.xz 1009352 SHA256 d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8 SHA512 816dbe677a25c45a202143b4b88a2d79ffa2a0775ab7fc66c81516698997e89c37f74c4713dfa26ae6ab16fd68d605d625eb21a4846be3527628ff9ad2483bc3 WHIRLPOOL 17c8bbaf5bec0ff25294c8e9e1f213f684c2fde3ecd396e6d183c502f50fb18eeb1ba8098b6f9ebe56f67c4b6f2f6278723e8abb02aa78f0b295739e65e65449
DIST gcalctool-6.6.2.tar.xz 968148 SHA256 e708a16cc758c3a9fcb07e9c3e45989f7d9d64e2993f440e99707fcea3e1b76c SHA512 67ecb2548ebea3729dfd25b784994c09679f2b0a840aa0679c5dac72a32cddda932c9ff153562902f7cbbfa61809235b88c3b5aeff2239656b46dfec65d40fb7 WHIRLPOOL 59225c91b8a6879c5f9f498f9771511954f195dac15d58626458f00ebf37db6439b225ebaf3ca23ef4743abbe174e9295288b90328ba72ee9fc6a7ac9bccc387

@ -1,36 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
EAPI="4"
GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="A calculator application for GNOME"
HOMEPAGE="http://live.gnome.org/Gcalctool http://calctool.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
COMMON_DEPEND=">=x11-libs/gtk+-2.90.7:3
>=dev-libs/glib-2.25.10:2
dev-libs/libxml2"
DEPEND="${COMMON_DEPEND}
>=app-text/gnome-doc-utils-0.3.2
app-text/scrollkeeper
>=dev-util/intltool-0.35
virtual/pkgconfig
sys-devel/bison
sys-devel/flex
sys-devel/gettext"
RDEPEND="${COMMON_DEPEND}
!<gnome-extra/gnome-utils-2.3"
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile"
DOCS="AUTHORS ChangeLog* NEWS README"
}

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild,v 1.1 2012/12/24 17:25:25 eva Exp $
EAPI="4"
EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
@ -15,23 +15,21 @@ SLOT="0"
IUSE=""
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
COMMON_DEPEND=">=x11-libs/gtk+-3:3
COMMON_DEPEND="
>=x11-libs/gtk+-3:3
>=dev-libs/glib-2.31:2
dev-libs/libxml2"
dev-libs/libxml2:2
"
RDEPEND="${COMMON_DEPEND}
!<gnome-extra/gnome-utils-2.3"
DEPEND="${COMMON_DEPEND}
>=app-text/gnome-doc-utils-0.3.2
app-text/scrollkeeper
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/pkgconfig
sys-devel/bison
sys-devel/flex
sys-devel/gettext"
"
pkg_setup() {
G2CONF="${G2CONF}
--disable-schemas-compile
ITSTOOL=$(type -P true)"
src_configure() {
DOCS="AUTHORS ChangeLog* NEWS README"
G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
gnome2_src_configure
}

@ -1,4 +1,3 @@
DIST gnome-color-manager-2.32.0.tar.bz2 2491525 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf SHA512 d21286f2dac6f1984aa4210892489c2faefd47eddb89d5ecfd05afd7590cfd3fbf446a75194a44feabbdc9b35feb20dee06f87fe208e641335fb3efa8c170915 WHIRLPOOL 905aad3a609b8393d617b311e25c7286a9f8181303db6731faacb5f117a0d2ebd3d4db08b9ae13afd3f5e9a3b86df1bce0dada391eb1bd456d42552813c8bd48
DIST gnome-color-manager-3.2.3.tar.xz 2495852 SHA256 5fc3073f97df5ddd98e2e85d75e9f4763129e62a565568c7b3c48aa6cf8cdb36 SHA512 f1015cd5b5a905adda12cd8e96cb79ce976f5bda2185feb44008be8790e809149b6a3f109c1783d600102313e4798099c971dc3a985fef536ff8624821d8267c WHIRLPOOL 79d963be671a7c2caca64bbc0e9d8831f5a9a2d0df41af9a5d3ab1b2fdb72e2d9c11404c4066db29bb328cd37efe705e3ba098965c7653a62ecc8742a47a6c69
DIST gnome-color-manager-3.2.4.tar.xz 2496792 SHA256 3b6146edf551b3cff9313658f9deccc5a7a595718b1e14313011ff5a0f1b2137 SHA512 68654b317dff1ff6428119c8cd7e6734779bd5ac81caa3e4b8e5dd73c05f5841c2c2699e1ac5c46dc409973e5082553c215dd483a6cc6b25ade1122554435150 WHIRLPOOL 9987189be1eb15cd9341f135e053ddbfcb096b6e605741aa10c0d8de1b4452ac768a767f604028c51f52534e71eb003397e31aad47f42c0bd713f0699de7062d
DIST gnome-color-manager-3.4.2.tar.xz 2520548 SHA256 ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922 SHA512 446c90789075036b7af008964c5c976670de6723c99ed88f8b9a3f0cc8a082e7988e8734fb6ac8a9bbade11c7dcd439a7a34e56063aa502e3531338eb7df6c49 WHIRLPOOL b4f2c0bbc27e1cc2f2931321e98480523992f4d2c5db0a82098034292b3bdbd6158ef6728a8887cfb9abe5cf2c7cbea603d739599468dfbb53b5407dbfd215b7
DIST gnome-color-manager-3.6.0.tar.xz 2564388 SHA256 c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9 SHA512 404f3a3db2f7f7a19d5d7e7c367bc06490fb81a896a41aa8e2195a701bf8bf571a43f85baf6884a5eed83d9e44a81e85d10c6f4f0215c1c9c09ab8f79bf207ff WHIRLPOOL b0df68836f08d0cf49da53d26440334cf4ba0b2d1e7e9d61dd03944c8eb60699e0b0d80f9ad0705456d0f0d010555adc231827c43758191ec7f8489f24638ed2

@ -1,79 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild,v 1.2 2012/05/21 19:02:27 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils gnome2
DESCRIPTION="Color profile manager for the GNOME desktop"
HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="clutter packagekit raw"
# FIXME: fix detection of docbook2man
COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
>=media-libs/lcms-2.2:2
>=media-libs/libcanberra-0.10[gtk3]
media-libs/libexif
media-libs/tiff
x11-libs/libX11
x11-libs/libXrandr
>=x11-libs/gtk+-2.91:3
>=x11-libs/vte-0.25.1:2.90
>=x11-misc/colord-0.1.12
clutter? (
media-libs/clutter-gtk:1.0
media-libs/mash:0.2 )
packagekit? ( app-admin/packagekit-base )
raw? ( media-gfx/exiv2 )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles
"
# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-dtd:4.1
app-text/docbook-sgml-utils
app-text/gnome-doc-utils
dev-libs/libxslt
>=dev-util/intltool-0.35
"
# FIXME: run test-suite with files on live file-system
RESTRICT="test"
pkg_setup() {
# Always enable tests since they are check_PROGRAMS anyway
G2CONF="${G2CONF}
--disable-static
--disable-schemas-compile
--disable-scrollkeeper
--enable-tests
$(use_enable clutter)
$(use_enable packagekit)
$(use_enable raw exiv)"
}
src_prepare() {
# argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319,
# https://bugzilla.gnome.org/show_bug.cgi?id=672028
epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
gnome2_src_prepare
}
pkg_postinst() {
gnome2_pkg_postinst
elog "If you want to do display or scanner calibration, you will need to"
elog "install media-gfx/argyllcms"
}

@ -1,24 +1,25 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.4.ebuild,v 1.2 2012/05/21 19:02:27 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild,v 1.1 2012/12/24 18:17:54 eva Exp $
EAPI="4"
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils gnome2
inherit gnome2
DESCRIPTION="Color profile manager for the GNOME desktop"
HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
LICENSE="GPL-2"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="clutter packagekit raw"
# FIXME: fix detection of docbook2man
COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
COMMON_DEPEND="
>=dev-libs/glib-2.31.10:2
gnome-base/gnome-desktop:3=
>=media-libs/lcms-2.2:2
>=media-libs/libcanberra-0.10[gtk3]
media-libs/libexif
@ -26,24 +27,23 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
x11-libs/libX11
x11-libs/libXrandr
>=x11-libs/gtk+-2.91:3
>=x11-libs/gtk+-3.3.8:3
>=x11-libs/vte-0.25.1:2.90
>=x11-misc/colord-0.1.12
>=x11-libs/colord-gtk-0.1.20
clutter? (
>=media-libs/clutter-1.9.11:1.0
media-libs/clutter-gtk:1.0
media-libs/mash:0.2 )
packagekit? ( app-admin/packagekit-base )
raw? ( media-gfx/exiv2 )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles
"
media-gfx/shared-color-profiles"
# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-dtd:4.1
app-text/docbook-sgml-utils
app-text/gnome-doc-utils
dev-libs/libxslt
>=dev-util/intltool-0.35
virtual/pkgconfig
@ -52,29 +52,23 @@ DEPEND="${COMMON_DEPEND}
# FIXME: run test-suite with files on live file-system
RESTRICT="test"
pkg_setup() {
src_configure() {
# Always enable tests since they are check_PROGRAMS anyway
G2CONF="${G2CONF}
--disable-static
--disable-schemas-compile
--disable-scrollkeeper
--enable-tests
$(use_enable clutter)
$(use_enable packagekit)
$(use_enable raw exiv)"
}
src_prepare() {
# argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319,
# https://bugzilla.gnome.org/show_bug.cgi?id=672028
epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
gnome2_src_prepare
$(use_enable raw exiv)
ITSTOOL=$(type -P true)"
gnome2_src_configure
}
pkg_postinst() {
gnome2_pkg_postinst
elog "If you want to do display or scanner calibration, you will need to"
elog "install media-gfx/argyllcms"
if ! has_version media-gfx/argyllcms ; then
elog "If you want to do display or scanner calibration, you will need to"
elog "install media-gfx/argyllcms"
fi
}

@ -1,5 +1,4 @@
DIST gnome-system-monitor-2.28.2-patches.tar.bz2 6400 RMD160 f7a6d875034ad5c657407b9258cbf01db212ded0 SHA1 741174f03d580693961568b5296830bde6e69e63 SHA256 d649ec0e5a63453b3e752fee5cc933ffed4b8d7653d15b039bdeaf3f7c514a06
DIST gnome-system-monitor-2.28.2.tar.bz2 2432252 RMD160 f2a31f4eae60a6d344cb74e6f235fb27082aecb7 SHA1 5fab2473914663320cf961c2bbe1a13f019edef3 SHA256 b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59
DIST gnome-system-monitor-3.2.1.tar.xz 2488492 RMD160 5e24833c0959eaf99014fa730e450397318de933 SHA1 2f3d4ec3cf88a9a9d65d30b6ad18124e3261b9aa SHA256 f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180
DIST gnome-system-monitor-3.4.0.tar.xz 2545548 RMD160 71a61699a6b6c5b2392f2676aa5f604a770805d4 SHA1 a6f7fcdbd626574b6ec1735583b35debcac3173f SHA256 e62047983f423f4a178f01d860e9b362e8c9757d4bbeadad0f261b97b4433d12
DIST gnome-system-monitor-3.4.1.tar.xz 2548064 RMD160 aa247e8f0f348a9032663c79c3bd79ef43579fcf SHA1 c39f90ca98e8245f6771572983dfc639938e7a1e SHA256 60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b
DIST gnome-system-monitor-2.28.2-patches.tar.bz2 6400 SHA256 d649ec0e5a63453b3e752fee5cc933ffed4b8d7653d15b039bdeaf3f7c514a06 SHA512 bbfe8a7d7feaaa2b7d95906ce985405e59a9a756002040761055bc2347355c569783bc57c9f52b4ac429f5ef6de921a1bede13a378a58d8c294533d9825f03b3 WHIRLPOOL 940caf04d2bd88acfc8e757906e214dc0aa991af44b098b261380771abe23edc4d634f6807b12c464df01f15c6f0a1e73628e818b84003a1e61693acc0a45a55
DIST gnome-system-monitor-2.28.2.tar.bz2 2432252 SHA256 b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59 SHA512 41d77fa9055ecfa1b379d7fd35c8f6401773f07a640f0b11e787cc985387d264cdb718aa0eed68e8b54f74abd301a98dbe8360160bda1e8e33459f83b3426e27 WHIRLPOOL 9782e92ee8d8e37fdd61dcb2af31ed8a68caa45e39eb2f6f3324d4484bad5b78723b1c03bdd699c6e6cf3c5de0e268f01105aaece6f7e3042118910407fe1c04
DIST gnome-system-monitor-3.4.1.tar.xz 2548064 SHA256 60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b SHA512 470ca4682b0b73052d9492423fa38d7d909437fa6c8ef3e7323385312f983640295d8e788e71c6b07e71e74b99ceb33f822e368e592ad8b22042c79bc3d6274c WHIRLPOOL 07aeaa037d0c70815cadde017a7309820fccaac7f3983819d32428506cbf35784939fe679e8fc50f7d5d043650718dad9ca7324f58242d7d99070cf93bb1ed49
DIST gnome-system-monitor-3.6.1.tar.xz 2664660 SHA256 e79e7d50223fc590e1b01afe493e63fd1859c2d2add5abacfe4f2d07ea8edbd8 SHA512 4697f889645f22699a0124385d6617cfe4dd5a32544b453bd6ba9d80271c1b4c36f31e0041addbaf2fdc2ea98043f2f870d369f39df48ffc3a777be52d14fb4e WHIRLPOOL 4d07f3ca3b625f776cab6a7a8c48e66858cd55932f6b6f62f636b5f46258a933ef0f0c8df3a87da9e7ee8f505ce6cf7d46b468087003343e9cf60a2d4829cecb

@ -1,39 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2.ebuild,v 1.10 2012/05/05 06:25:23 jdhore Exp $
EAPI="3"
GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="The Gnome System Monitor"
HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-libs/glib-2.20:2
>=gnome-base/gconf-2:2
>=x11-libs/libwnck-2.5:1
>=gnome-base/libgtop-2.23.1:2
>=x11-libs/gtk+-2.20:2
>=x11-themes/gnome-icon-theme-2.15.3
>=dev-cpp/gtkmm-2.8:2.4
>=dev-cpp/glibmm-2.16:2
dev-libs/libxml2:2
>=gnome-base/librsvg-2.12:2
>=dev-libs/dbus-glib-0.70"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=app-text/scrollkeeper-0.3.11
>=dev-util/intltool-0.35
app-text/gnome-doc-utils"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF} --disable-scrollkeeper"
}

@ -1,39 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.2.1.ebuild,v 1.2 2012/05/05 06:25:23 jdhore Exp $
EAPI="4"
GCONF_DEBUG="no"
inherit gnome2
DESCRIPTION="The Gnome System Monitor"
HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-libs/glib-2.28:2
>=x11-libs/libwnck-2.91.0:3
>=gnome-base/libgtop-2.28.2:2
>=x11-libs/gtk+-3.0:3
>=x11-themes/gnome-icon-theme-2.31
>=dev-cpp/gtkmm-2.99:3.0
>=dev-cpp/glibmm-2.27:2
>=dev-libs/libxml2-2.0:2
>=gnome-base/librsvg-2.12:2"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=dev-util/intltool-0.41.0
>=sys-devel/gettext-0.17
>=app-text/gnome-doc-utils-0.20"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
G2CONF="${G2CONF}
--disable-schemas-compile
--disable-scrollkeeper"
}

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.4.0.ebuild,v 1.2 2012/05/05 06:25:23 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild,v 1.1 2012/12/24 18:04:43 eva Exp $
EAPI="4"
EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
@ -12,8 +12,8 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="systemd"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
RDEPEND=">=dev-libs/glib-2.28:2
>=x11-libs/libwnck-2.91.0:3
@ -25,20 +25,20 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=dev-libs/libxml2-2.0:2
>=gnome-base/librsvg-2.35:2
systemd? ( >=sys-apps/systemd-38 )"
systemd? ( >=sys-apps/systemd-38 )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=app-text/gnome-doc-utils-0.20
>=dev-util/intltool-0.41.0
>=sys-devel/gettext-0.17
>=app-text/gnome-doc-utils-0.20
virtual/pkgconfig
systemd? ( !=sys-apps/systemd-43* )"
systemd? ( !=sys-apps/systemd-43* )
"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README"
src_configure() {
G2CONF="${G2CONF}
--disable-schemas-compile
--disable-scrollkeeper
$(use_enable systemd)"
$(use_enable systemd)
ITSTOOL=$(type -P true)"
gnome2_src_configure
}

@ -1,2 +1,3 @@
DIST gucharmap-3.0.1.tar.bz2 3275481 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1 WHIRLPOOL 6c9aaaaf31428db5257f98da741513c192ca32371b5d19952471d09586900186b269192b8ae6902e430e7fb3116bccc7d6ed4bca050ad0ca58eb14d7817d569a
DIST gucharmap-3.4.1.1.tar.xz 2761188 SHA256 52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62 SHA512 ac7ec10537874a21761ea631aac9c07d31900fe2d1a4b86b4c37017a52bb844ede86f46a5cfe96103eb43faed25b496503f5095734b0e3a3b46ea8853ae6e227 WHIRLPOOL a21ac19488d7ace50cc2f6787cc454404116b45b68e269d598218daf66885f17b2d81f20107e5a4ed12d28e9c112138847ec2fb57f34cd62ea1f4e98c4856bd9
DIST gucharmap-3.6.1.tar.xz 1888388 SHA256 c3aad2990010ab66225b748e6ac5402cad9f21e908cddf728e57d755c54cc6b2 SHA512 ee4fbe8ed6f7703e7c82670554b080a68feb50de11e295cabae747fbc39f11bf38b8f898d834c4d6b99f93411458ee01a5f6b9b0c2f0fde5ed2f30cca3e40200 WHIRLPOOL 6cdb3e6bae7782777d69bb151082779137e3119d91be73757b86696df2a5d89cfce41a519a92562a21038c3f54250d740797c52ce2be1421fea171ec77efc59a

@ -0,0 +1,58 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.6.1.ebuild,v 1.1 2012/12/24 18:51:52 eva Exp $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
VALA_MIN_API_VERSION="0.16"
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
DESCRIPTION="Unicode character map viewer and library"
HOMEPAGE="http://live.gnome.org/Gucharmap"
LICENSE="GPL-3"
SLOT="2.90"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="cjk +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
COMMON_DEPEND="
>=dev-libs/glib-2.32
>=x11-libs/pango-1.2.1[introspection?]
>=x11-libs/gtk+-3.4.0:3[introspection?]
introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
"
RDEPEND="${COMMON_DEPEND}
!<gnome-extra/gucharmap-3:0
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1
>=dev-util/intltool-0.40
sys-devel/gettext
virtual/pkgconfig
test? ( ~app-text/docbook-xml-dtd-4.1.2 )
vala? ( $(vala_depend) )
"
src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
--disable-static
$(use_enable introspection)
$(use_enable cjk unihan)
$(use_enable vala)"
# prevent file collisions with slot 0
sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-i configure.ac configure || die "sed configure.ac configure failed"
use vala && vala_src_prepare
gnome2_src_prepare
# avoid autoreconf
sed -e 's/-Wall //g' -i configure || die "sed failed"
}

@ -3,7 +3,6 @@
<pkgmetadata>
<herd>gnome</herd>
<use>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
introspection</flag>
<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
</use>
</pkgmetadata>

@ -1,3 +1,2 @@
DIST balsa-2.4.11.tar.bz2 4076223 SHA256 41160c8c107aaecacbe29974b39f2cc1ef649793cf7af9c58d5eed4120bb2888
DIST balsa-2.4.12.tar.bz2 4104426 SHA256 3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4 SHA512 eec2faae6c0d942ccc0a3a1c66cc3a1eaf57695c86b3baedd18e528b06133518ff6cd6110ac67e5b50f2fed298b442b05964b8bb9a524ff6aab0f11e61a407ef WHIRLPOOL 5d8fdb70a8d366a0fa65af51a3a888ae005ab1e53ac802ea03ab47e3c51381126bd0dab3aa43e1e2d0c92906bc0df86f90e3664c667fbfad56ced2d03cd4a37c
DIST balsa-2.4.8.tar.bz2 3150866 SHA256 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf SHA512 aea72a4831df59cf3213efdf4aa6ef9212e4e9287c4a0844848d5affc4039717cd3ea9053604b4e84712450b254b81a2cf136635f0c4fc80babb8095902a4e62 WHIRLPOOL 43e35429bf365714d31be88fb5b80723f172a39597afa780e82d7b155318966d1c52a54f53efd151a7c8ee745f6dd287cb4e0454de02bbb9eb336e80089fa221
DIST balsa-2.4.13.tar.bz2 4108408 SHA256 99194e39cec02191672f53a0ef9841eadfee57e27179befde26b1c80c173fa6d SHA512 6d125593eacc4ffaeaed316ff8d5ebbe27670a7e4feb5aab16f5c539f8d3e671add8a4a606ef4873e8b1ea0837f601fa08d77d028cc21ae83385e5ddbc215bdd WHIRLPOOL 2d48354b6cbf65dc5c83d0f358076040e4a4debb9b73ea96a57e3f764c6ca3465587c11319df29524ce5874ba2f3aded819936bd57ba439db8fe63388244113f

@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.11.ebuild,v 1.2 2012/05/04 08:42:23 jdhore Exp $
# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.13.ebuild,v 1.1 2012/12/24 21:06:46 pacho Exp $
EAPI="4"
EAPI="5"
GCONF_DEBUG="no"
inherit eutils gnome2
@ -20,14 +20,14 @@ IUSE="crypt gnome gtkhtml +gtkspell kerberos ldap libnotify networkmanager rubri
# TODO: esmtp can be optional
RDEPEND=">=dev-libs/glib-2.16:2
>=x11-libs/gtk+-2.18:2
dev-libs/gmime:2.4
dev-libs/gmime:2.6
dev-libs/libunique:1
>=net-libs/libesmtp-1.0.3
>=net-libs/libesmtp-1.0.3:=
net-mail/mailbase
media-libs/libcanberra[gtk]
media-libs/libcanberra:=[gtk]
x11-themes/hicolor-icon-theme
x11-themes/gnome-icon-theme
crypt? ( >=app-crypt/gpgme-1.0 )
crypt? ( >=app-crypt/gpgme-1.0:= )
gnome? (
>=gnome-base/orbit-2
>=gnome-base/libbonobo-2.0
@ -37,8 +37,8 @@ RDEPEND=">=dev-libs/glib-2.16:2
>=gnome-base/gnome-keyring-2.20
>=x11-libs/gtksourceview-2.10:2.0 )
gtkhtml? ( >=gnome-extra/gtkhtml-3.14:3.14 )
sqlite? ( >=dev-db/sqlite-2.8 )
libnotify? ( >=x11-libs/libnotify-0.7 )
sqlite? ( >=dev-db/sqlite-2.8:= )
libnotify? ( >=x11-libs/libnotify-0.7:= )
gtkspell? (
app-text/gtkspell:2
app-text/enchant )
@ -47,9 +47,9 @@ RDEPEND=">=dev-libs/glib-2.16:2
ldap? ( net-nds/openldap )
networkmanager? ( >=net-misc/networkmanager-0.7 )
rubrica? ( dev-libs/libxml2:2 )
ssl? ( dev-libs/openssl )
ssl? ( dev-libs/openssl:= )
webkit? ( >=net-libs/webkit-gtk-1.5.1:2 )
xface? ( >=media-libs/compface-1.5.1 )"
xface? ( >=media-libs/compface-1.5.1:= )"
DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig
@ -59,30 +59,30 @@ DEPEND="${RDEPEND}
REQUIRED_USE="gtkhtml? ( !webkit )"
DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
src_prepare() {
DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
pkg_setup() {
if use crypt ; then
G2CONF="${G2CONF} --with-gpgme=gpgme-config"
G2CONF+=" --with-gpgme=gpgme-config"
else
G2CONF="${G2CONF} --without-gpgme"
G2CONF+=" --without-gpgme"
fi
if use webkit || use gtkhtml; then
if use gtkhtml ; then
G2CONF="${G2CONF} --with-html-widget=gtkhtml3"
G2CONF+=" --with-html-widget=gtkhtml3"
else
G2CONF="${G2CONF} --with-html-widget=webkit"
G2CONF+=" --with-html-widget=webkit"
fi
else
G2CONF="${G2CONF} --with-html-widget=no"
G2CONF+=" --with-html-widget=no"
fi
G2CONF="${G2CONF}
G2CONF+="
--disable-pcre
--enable-gregex
--enable-threads
--with-gmime=2.4
--with-gmime=2.6
--with-unique
--with-canberra
$(use_with gnome)
@ -96,11 +96,9 @@ pkg_setup() {
$(use_with sqlite)
$(use_with ssl)
$(use_with xface compface)"
}
src_prepare() {
# Fix documentation
epatch "${FILESDIR}/${P}-doc-fixes.patch"
epatch "${FILESDIR}/${PN}-2.4.11-doc-fixes.patch"
gnome2_src_prepare
}

@ -1,107 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.8.ebuild,v 1.11 2012/05/04 08:42:23 jdhore Exp $
EAPI="2"
GCONF_DEBUG="no"
inherit eutils gnome2
DESCRIPTION="Email client for GNOME"
HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ppc sparc x86"
# Doesn't currently build with -gnome
IUSE="crypt gnome gtkhtml +gtkspell kerberos ldap libnotify networkmanager rubrica sqlite ssl webkit xface"
# TODO: esmtp can be optional
RDEPEND=">=dev-libs/glib-2.16:2
>=x11-libs/gtk+-2.18:2
dev-libs/gmime:2.4
dev-libs/libunique:1
>=net-libs/libesmtp-1.0.3
net-mail/mailbase
media-libs/libcanberra[gtk]
x11-themes/hicolor-icon-theme
x11-themes/gnome-icon-theme
crypt? ( >=app-crypt/gpgme-1.0 )
gnome? (
>=gnome-base/orbit-2
>=gnome-base/libbonobo-2.0
>=gnome-base/libgnome-2.0
>=gnome-base/libgnomeui-2.0
>=gnome-base/gconf-2.0:2
>=gnome-base/gnome-keyring-2.20
>=x11-libs/gtksourceview-2.10:2.0 )
gtkhtml? ( >=gnome-extra/gtkhtml-3.14:3.14 )
sqlite? ( >=dev-db/sqlite-2.8 )
libnotify? ( x11-libs/libnotify )
gtkspell? (
app-text/gtkspell:2
app-text/enchant )
!gtkspell? ( app-text/aspell )
kerberos? ( app-crypt/mit-krb5 )
ldap? ( net-nds/openldap )
networkmanager? ( >=net-misc/networkmanager-0.7 )
rubrica? ( dev-libs/libxml2:2 )
ssl? ( dev-libs/openssl )
webkit? ( >=net-libs/webkit-gtk-1.1.14:2 )
xface? ( >=media-libs/compface-1.5.1 )"
DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig
sys-devel/gettext
>=app-text/scrollkeeper-0.1.4
app-text/gnome-doc-utils"
DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
pkg_setup() {
if use crypt ; then
G2CONF="${G2CONF} --with-gpgme=gpgme-config"
else
G2CONF="${G2CONF} --without-gpgme"
fi
if use webkit && use gtkhtml ; then
ewarn "Only one html widget can be enabled at the same time."
ewarn "Selecting gtkhtml by default."
fi
if use webkit || use gtkhtml; then
if use gtkhtml ; then
G2CONF="${G2CONF} --with-html-widget=gtkhtml3"
else
G2CONF="${G2CONF} --with-html-widget=webkit"
fi
else
G2CONF="${G2CONF} --with-html-widget=no"
fi
G2CONF="${G2CONF}
--disable-pcre
--enable-gregex
--enable-threads
--with-gmime=2.4
--with-unique
--with-canberra
$(use_with gnome)
$(use_with gnome gtksourceview)
$(use_with gtkspell)
$(use_with kerberos gss)
$(use_with ldap)
$(use_with libnotify)
$(use_with networkmanager nm)
$(use_with rubrica)
$(use_with sqlite)
$(use_with ssl)
$(use_with xface compface)"
}
src_prepare() {
epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
gnome2_src_prepare
}

@ -1,51 +0,0 @@
--- libbalsa/information.c
+++ libbalsa/information.c
@@ -27,6 +27,9 @@
#ifdef HAVE_NOTIFY
#include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
#include <gtk/gtk.h>
#endif
#include <string.h>
@@ -122,7 +125,11 @@
g_free(msg);
note =
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ notify_notification_new("Balsa", escaped->str, icon_str);
+#else
notify_notification_new("Balsa", escaped->str, icon_str, NULL);
+#endif
g_string_free(escaped, TRUE);
notify_notification_set_timeout(note, 7000); /* 7 seconds */
--- src/main-window.c
+++ src/main-window.c
@@ -85,6 +85,12 @@
#define MAILBOX_DATA "mailbox_data"
+#ifdef HAVE_NOTIFY
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+#endif
+
enum {
OPEN_MAILBOX_NODE,
CLOSE_MAILBOX_NODE,
@@ -3406,7 +3412,11 @@
} else {
num_total = num_new;
balsa_app.main_window->new_mail_note =
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+ notify_notification_new("Balsa", NULL, NULL);
+#else
notify_notification_new("Balsa", NULL, NULL, NULL);
+#endif
g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
new_mail_note),
(gpointer) & balsa_app.main_window->

@ -1,4 +1,4 @@
DIST postfix-2.10-20121210.tar.gz 3817926 SHA256 985c6a10805f0b63dac42e36f96915435b811c1fa6b60a62a0e30876bfee6867 SHA512 49154b675c758fdc374c8d271cd2e2cdd1bf1bcdd318441cf8c3c868bb26c69c3fc1c58034f0efbf8923fcaa0e848d6ed58819b11b376255bb7b6cd1823cbcd2 WHIRLPOOL f64071c1da92e94318d653792f77d87cce38158234baa97b5778ebc99e9c67151183975c073fbe20bba772e33277fd637f21c436753b925380e439ec79ff70cc
DIST postfix-2.10-20121224.tar.gz 3822128 SHA256 4754ca131a07d9ffe4431e299ca36fc24785c79d85c5df9488b67a3ad007b484 SHA512 8eb076239d27a48abffee4be5864b3b94e6dee7b9b597cd60c19a11f053f6fc8a8a655d6f0c870f0ca41a10bf80dba53e1ca0a2304d9a9795a0bcabfd7d7774b WHIRLPOOL 9fa077b2a8a4cb5c7cfe3d8ef4de3a3cf9d364fe0551b8a149f3cac9fee6aa82c4dd998274df52848f5131132726f8c6a2139f5d95f695d5b2518849140dfc3d
DIST postfix-2.8.12.tar.gz 3641269 SHA256 f46b0117cab52e862b12869810327e2bd248a60f209079a875818ee2653de087 SHA512 55141e75da43b13975f85af636dceeed7783440fb5f7b83642e5a146d8a06af3a847beff77fe0dd495c58c7caed492dbb2dc52f542f44b9388f2ded30e37acee WHIRLPOOL 1d3c454fc938546c74b666feb109229a71b4e55d72c6f3833a15a81ec8eb3b48e318df69611fe4c40ac970332a8fcdfe98fa235863ae44bdf952b2b74537100c
DIST postfix-2.8.13.tar.gz 3641782 SHA256 66d278471b790eed663d6fe991403395e6340d45c92c8d0c445f7e9d77881502 SHA512 f316b27371d56fc1ae6c51966ff60ec5fab658b92053aaf45093f6f3fc421637e00d9c75bf4140e66ed3300ace2453b5449ec356008cd057a550cee21eb95262 WHIRLPOOL edede2fdace67aa9cefe8f9c044b86a4fc152c9108ec0b83471152bbcdec4b8255a627edcfb75962157e5cb75383d2569fa668234741f60f811cfa0a0890cecc
DIST postfix-2.8.9.tar.gz 3648498 SHA256 6a63bafad1002abbab2d2592a40dc4b3e35defd97f2026d6ccc398e5d7ee9bf3 SHA512 74c3735e8e701f223c2730345fb3d2876e839579d431d21c9b5ae870eac06c17978e2071dd31e3e08f947d2a20281e644af011749407f9bd7afaf53ce278ca6a WHIRLPOOL 1809ece94697c7ae6a8e9dfaf3a89ddc7e1f2e049e51d02f6772f554b4af5040cc07538886ec32491cc40b57c17e03e32663ef3f811324f7a2a0cbe926ff7c8a

@ -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/mail-mta/postfix/postfix-2.10_pre20121210.ebuild,v 1.1 2012/12/11 11:04:28 eras Exp $
# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20121224.ebuild,v 1.1 2012/12/25 05:49:10 eras Exp $
EAPI=4
inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
@ -283,8 +283,8 @@ pkg_preinst() {
# Safety net for incompatible changes due to the introduction
# of the smtpd_relay_restrictions feature to separate the
# mail relay policy from the spam blocking policy.
[[ -d ${ROOT}/etc/postfix ]] && {
if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n smtpd_relay_restrictions)" ]];
[[ -d ${ROOT}/etc/postfix ]] && has_version '<=mail-mta/postfix-2.9.99' && {
if [[ -z "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n smtpd_relay_restrictions)" ]];
then
local myconf="smtpd_relay_restrictions=permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination"
ewarn "\nCOMPATIBILITY: adding smtpd_relay_restrictions to main.cf"

@ -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/media-libs/skstream/skstream-0.3.9.ebuild,v 1.3 2012/12/22 14:06:39 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/skstream/skstream-0.3.9.ebuild,v 1.4 2012/12/25 03:59:52 jdhore Exp $
EAPI=2
inherit base eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~x86"
KEYWORDS="amd64 ppc x86"
IUSE="test"
DEPEND="test? ( dev-util/cppunit )"

@ -1,2 +1,5 @@
DIST xbmc-11.0-ffmpeg-1.0-compat-1.tar.bz2 32687 SHA256 bfdca8283c35d0062ed2c2b3f67da29dcd71bb3e0f6b06c1dcc2e43d35d7c427 SHA512 e28f69719ee9b7343c8f43f34b0ae932b66452507daf3876f10e78c79fc2edeee2569c8470c0a7519ff24a43bf2558fe6d9e08a3aca73123ef423447b90f6abf WHIRLPOOL e0caafa34d99f8cfd7908ee7755352f2972794cd7460b04ab207d4f55ec39cbf09a22c77fc954b269d09b232dcf0cb357d6a41568337df5ea97aae6ee0d6faa6
DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
DIST xbmc-12.0_rc2-generated-addons.tar.xz 51984 SHA256 ea7a021c7fd28fa88476dddaf88b7fee9917de2364a57113dbbeda47e402bb52 SHA512 a2379276d2ffcb62e4410599ec1e8637eb52bd74f89731ceb66e92ac2e25cfe92eda76fd0e732749109e0b1986861815e0940d6be4380cab1029106420952578 WHIRLPOOL 571d9e8691ad6d49508708ee495262305eb15a18e8b0543aa308006e3216680e913761d1706c6bed2448eeb37f4546727cde922988fa0c6e9598a429e9f0b170
DIST xbmc-12.0_rc2.tar.gz 63734373 SHA256 e8d08df41ddbd6490e07f46c9ce28d7ada216012647f52f5e54a3e6618aa8c69 SHA512 e738c22abf9477ddd5c6be977e85303679bbf5baa524da8baa34426930f3c4599e4bf6f8aba9a093ebf81b9948c77d3bb381cdf50457ca39fbbfe3dd3411b297 WHIRLPOOL a30730c69c8b1808fb6d500b682f46517c77495e08cc61db304d14db09c0a42c8ac9b05a45a4783c05a891fe5d3f190533608806432b8e29577b23768062b9de
DIST xbmc-9999-20121224-generated-addons.tar.xz 51980 SHA256 21284fe7ccee065eee10064f73a469722d6ffddf2fe882a0aefc07ea0eba0401 SHA512 48cdf8c685a48cd32462509962c888e8bc16254268d6fc891aacc5222da42e227ee5b6858c9e2b80d7d9fecc63862cd0c62c181a106212886a25f9be52778a1f WHIRLPOOL 12a31d33cc322b4afc3bdc829fc330a0971cab8a557a2f87885569d817a3664ae7506bfe7984322ec95b7786a246cd5edb10fceabfd96965ef33dd19cb934ae7

@ -0,0 +1,238 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.0_rc2.ebuild,v 1.1 2012/12/25 04:08:18 vapier Exp $
EAPI="4"
# Does not work with py3 here
# It might work with py:2.5 but I didn't test that
PYTHON_DEPEND="2:2.6"
inherit eutils python multiprocessing autotools
case ${PV} in
9999)
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
inherit git-2
SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
;;
*_alpha*|*_beta*|*_rc*)
MY_PV="Frodo_${PV#*_}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
KEYWORDS="~amd64 ~x86"
;;
*)
MY_P=${P/_/-*_}
SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~x86"
;;
esac
DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
HOMEPAGE="http://xbmc.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom java joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
REQUIRED_USE="pvr? ( mysql )"
COMMON_DEPEND="virtual/glu
virtual/opengl
app-arch/bzip2
app-arch/unzip
app-arch/zip
app-i18n/enca
airplay? ( app-pda/libplist )
>=dev-lang/python-2.4
dev-libs/boost
dev-libs/fribidi
dev-libs/libcdio[-minimal]
cec? ( >=dev-libs/libcec-2 )
dev-libs/libpcre[cxx]
>=dev-libs/lzo-2.04
dev-libs/tinyxml
dev-libs/yajl
>=dev-python/pysqlite-2
dev-python/simplejson
media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
>=media-libs/glew-1.5.6
media-libs/jasper
media-libs/jbigkit
>=media-libs/libass-0.9.7
bluray? ( media-libs/libbluray )
css? ( media-libs/libdvdcss )
media-libs/libmad
media-libs/libmodplug
media-libs/libmpeg2
media-libs/libogg
media-libs/libpng
projectm? ( media-libs/libprojectm )
media-libs/libsamplerate
media-libs/libsdl[audio,opengl,video,X]
alsa? ( media-libs/libsdl[alsa] )
>=media-libs/taglib-1.8
media-libs/libvorbis
media-libs/sdl-gfx
>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
media-libs/sdl-mixer
media-libs/sdl-sound
media-libs/tiff
pulseaudio? ( media-sound/pulseaudio )
media-sound/wavpack
|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
>=virtual/ffmpeg-0.6[encode]
rtmp? ( media-video/rtmpdump )
avahi? ( net-dns/avahi )
nfs? ( net-fs/libnfs )
webserver? ( net-libs/libmicrohttpd )
sftp? ( net-libs/libssh )
net-misc/curl
samba? ( >=net-fs/samba-3.4.6[smbclient] )
bluetooth? ( net-wireless/bluez )
sys-apps/dbus
sys-libs/zlib
virtual/jpeg
mysql? ( virtual/mysql )
x11-apps/xdpyinfo
x11-apps/mesa-progs
vaapi? ( x11-libs/libva[opengl] )
vdpau? (
|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
virtual/ffmpeg[vdpau]
)
x11-libs/libXinerama
xrandr? ( x11-libs/libXrandr )
x11-libs/libXrender"
RDEPEND="${COMMON_DEPEND}
udev? ( sys-fs/udisks:0 sys-power/upower )"
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
dev-lang/swig
dev-util/gperf
x11-proto/xineramaproto
dev-util/cmake
x86? ( dev-lang/nasm )
java? ( virtual/jre )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_unpack() {
[[ ${PV} == "9999" ]] && git-2_src_unpack
default
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
# The mythtv patch touches configure.ac, so force a regen
rm -f configure
# some dirs ship generated autotools, some dont
multijob_init
local d
for d in $(printf 'f:\n\techo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
[[ -e ${d} ]] && continue
pushd ${d/%\/configure/.} >/dev/null
AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
multijob_child_init eautoreconf
popd >/dev/null
done
multijob_finish
elibtoolize
# Disable internal func checks as our USE/DEPEND
# stuff handles this just fine already #408395
export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
local squish #290564
use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
use sse && squish="-DSQUISH_USE_SSE=1 -msse"
use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
sed -i \
-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
-e "1iCXXFLAGS += ${squish}" \
lib/libsquish/Makefile.in || die
# Fix XBMC's final version string showing as "exported"
# instead of the SVN revision number.
export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
# avoid long delays when powerkit isn't running #348580
sed -i \
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
xbmc/linux/*.cpp || die
epatch_user #293109
# Tweak autotool timestamps to avoid regeneration
find . -type f -print0 | xargs -0 touch -r configure
}
src_configure() {
# Disable documentation generation
export ac_cv_path_LATEX=no
# Avoid help2man
export HELP2MAN=$(type -P help2man || echo true)
# No configure flage for this #403561
export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
# Requiring java is asine #434662
export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
econf \
--docdir=/usr/share/doc/${PF} \
--disable-ccache \
--disable-optimizations \
--enable-external-libraries \
--enable-gl \
$(use_enable airplay) \
$(use_enable avahi) \
$(use_enable bluray libbluray) \
$(use_enable cec libcec) \
$(use_enable css dvdcss) \
$(use_enable debug) \
$(use_enable goom) \
--disable-hal \
$(use_enable joystick) \
$(use_enable midi mid) \
$(use_enable mysql) \
$(use_enable nfs) \
$(use_enable profile profiling) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
$(use_enable pvr mythtv) \
$(use_enable rsxs) \
$(use_enable rtmp) \
$(use_enable samba) \
$(use_enable sftp ssh) \
$(use_enable upnp) \
$(use_enable vaapi) \
$(use_enable vdpau) \
$(use_enable webserver) \
$(use_enable xrandr)
}
src_install() {
default
rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
domenu tools/Linux/xbmc.desktop
newicon tools/Linux/xbmc-48x48.png xbmc.png
insinto "$(python_get_sitedir)" #309885
doins tools/EventClients/lib/python/xbmcclient.py || die
newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
}
pkg_postinst() {
elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
}

@ -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/media-tv/xbmc/xbmc-9999.ebuild,v 1.124 2012/12/24 02:10:04 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.125 2012/12/25 04:08:18 vapier Exp $
EAPI="4"
@ -8,25 +8,34 @@ EAPI="4"
# It might work with py:2.5 but I didn't test that
PYTHON_DEPEND="2:2.6"
inherit eutils python
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
if [[ ${PV} == "9999" ]] ; then
inherit git-2 autotools
else
inherit autotools
inherit eutils python multiprocessing autotools
case ${PV} in
9999)
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
inherit git-2
SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
;;
*_alpha*|*_beta*|*_rc*)
MY_PV="Frodo_${PV#*_}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
KEYWORDS="~amd64 ~x86"
;;
*)
MY_P=${P/_/-*_}
SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
;;
esac
DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
HOMEPAGE="http://xbmc.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom java joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
REQUIRED_USE="pvr? ( mysql )"
COMMON_DEPEND="virtual/glu
@ -102,11 +111,15 @@ COMMON_DEPEND="virtual/glu
RDEPEND="${COMMON_DEPEND}
udev? ( sys-fs/udisks:0 sys-power/upower )"
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
dev-lang/swig
dev-util/gperf
x11-proto/xineramaproto
dev-util/cmake
x86? ( dev-lang/nasm )"
x86? ( dev-lang/nasm )
java? ( virtual/jre )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
python_set_active_version 2
@ -114,18 +127,7 @@ pkg_setup() {
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-2_src_unpack
cd "${S}"
rm -f configure
else
unpack ${A}
cd "${S}"
fi
# Fix case sensitivity
mv media/Fonts/{a,A}rial.ttf || die
mv media/{S,s}plash.png || die
[[ ${PV} == "9999" ]] && git-2_src_unpack || default
}
src_prepare() {
@ -135,18 +137,17 @@ src_prepare() {
rm -f configure
# some dirs ship generated autotools, some dont
multijob_init
local d
for d in \
. \
lib/{libdvd/lib*/,cpluff} \
xbmc/screensavers/rsxs-* \
xbmc/visualizations/Goom/goom2k4-0
do
[[ -e ${d}/configure ]] && continue
pushd ${d} >/dev/null
eautoreconf
for d in $(printf 'f:\n\techo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
[[ -e ${d} ]] && continue
pushd ${d/%\/configure/.} >/dev/null
AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
multijob_child_init eautoreconf
popd >/dev/null
done
multijob_finish
elibtoolize
# Disable internal func checks as our USE/DEPEND
# stuff handles this just fine already #408395
@ -183,6 +184,8 @@ src_configure() {
export HELP2MAN=$(type -P help2man || echo true)
# No configure flage for this #403561
export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
# Requiring java is asine #434662
export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
econf \
--docdir=/usr/share/doc/${PF} \

@ -1 +1 @@
Mon, 24 Dec 2012 17:07:01 +0000
Tue, 25 Dec 2012 06:36:51 +0000

@ -1 +1 @@
Mon, 24 Dec 2012 17:07:01 +0000
Tue, 25 Dec 2012 06:36:51 +0000

@ -1,12 +0,0 @@
DEFINED_PHASES=install
DEPEND=dev-lang/php[cli,simplexml] dev-php/pear
DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
EAPI=4
HOMEPAGE=http://drupal.org/project/drush
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,simplexml] dev-php/pear
SLOT=0
SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-4.4.tar.gz -> drush-4.4.tar.gz
_md5_=0c0dd7a2593315c1ac77b4925456114f

@ -1,12 +0,0 @@
DEFINED_PHASES=install
DEPEND=dev-lang/php[cli,simplexml] dev-php/pear
DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
EAPI=4
HOMEPAGE=http://drupal.org/project/drush
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,simplexml] dev-php/pear
SLOT=0
SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz -> drush-4.5.tar.gz
_md5_=296edfd78b34e342778752054aeace11

@ -4,9 +4,9 @@ DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
EAPI=4
HOMEPAGE=http://drupal.org/project/drush
IUSE=examples
KEYWORDS=~amd64 ~x86
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,simplexml] dev-php/pear dev-php/PEAR-Console_Table
SLOT=0
SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz -> drush-4.5.tar.gz
_md5_=084aea0ea39c807af7253163302f36ff
_md5_=1cfc928493b8855488b731cb8bb932d7

@ -0,0 +1,12 @@
DEFINED_PHASES=install prepare
DEPEND=dev-lang/php[cli,simplexml] dev-php/pear dev-php/PEAR-Console_Table
DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
EAPI=4
HOMEPAGE=http://drupal.org/project/drush
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,simplexml] dev-php/pear dev-php/PEAR-Console_Table
SLOT=0
SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-4.6.tar.gz -> drush-4.6.tar.gz
_md5_=a16dea276fadce37af9e9ed40feb224a

@ -4,10 +4,10 @@ DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
EAPI=4
HOMEPAGE=http://drupal.org/project/drush
IUSE=+examples
KEYWORDS=~amd64 ~x86
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,simplexml] dev-php/pear dev-php/PEAR-Console_Table dev-php/PEAR-Console_Getopt
SLOT=0
SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-5.1.tar.gz -> drush-5.1.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6
_md5_=3801c01a19635a5094f931970fe02f6e
_md5_=5b21eb026c0005229ae09c2f06c98d8f

@ -0,0 +1,13 @@
DEFINED_PHASES=install prepare
DEPEND=dev-lang/php[cli,simplexml] dev-php/pear dev-php/PEAR-Console_Table dev-php/PEAR-Console_Getopt
DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
EAPI=4
HOMEPAGE=http://drupal.org/project/drush
IUSE=+examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/php[cli,simplexml] dev-php/pear dev-php/PEAR-Console_Table dev-php/PEAR-Console_Getopt
SLOT=0
SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-5.8.tar.gz -> drush-5.8.tar.gz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6
_md5_=c9a1ada3cb4cda100e46d52e268ef9a3

@ -10,4 +10,4 @@ RDEPEND=cron? ( sys-process/cronbase ) isag? ( dev-lang/tk dev-vcs/rcs sci-visua
SLOT=0
SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-10.1.3.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=23d13599fb822253dbc43a85a248fed9
_md5_=d2578e63f61baeb0a3cd3d21903f6c8a

@ -4,10 +4,10 @@ DESCRIPTION=replacement of the old unix crypt(1)
EAPI=2
HOMEPAGE=http://mcrypt.sourceforge.net/
IUSE=nls
KEYWORDS=~amd64 ~ppc ~sparc x86 ~x86-macos
KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-macos
LICENSE=GPL-2
RDEPEND=>=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib
SLOT=0
SRC_URI=mirror://sourceforge/mcrypt/mcrypt-2.6.8.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
_md5_=a0886d9051f48b9b0ee66849840304b8
_md5_=92533aa37bd7e60919b8e23dbe9dd12d

@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl ) kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=mirror://berlios/tpm-emulator/tpm_emulator-0.7.4.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 61ad55e732e494378165e7dcd4744b91 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 udev 4f764d2b1e34e4ef12b9b0d6e680c0ee user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
_md5_=66137b544545aa959130162f2b212b89
_md5_=79914d55c26be86bb10e0330bb3af9c4

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save