From 5597715447ae689159daebec5cbb68b4276be4a0 Mon Sep 17 00:00:00 2001 From: Martin von Gagern Date: Mon, 18 Aug 2008 10:06:15 +0200 Subject: [PATCH] Allow for sys-libs/e2fsprogs-libs as a replacement for com_err and ss. --- app-crypt/heimdal/Manifest | 20 ++++++++++---------- app-crypt/heimdal/heimdal-1.1-r1.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.1.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc2-r1.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc2-r2.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc2-r3.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc2-r4.ebuild | 4 ++-- app-crypt/heimdal/heimdal-1.2.1_rc2.ebuild | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest index 35082e9..83c0756 100644 --- a/app-crypt/heimdal/Manifest +++ b/app-crypt/heimdal/Manifest @@ -12,14 +12,14 @@ DIST heimdal-1.2.1.tar.gz 5234882 RMD160 055e858200e53108ac24760516ff9d58e4fee0d DIST heimdal-1.2.1rc1.tar.gz 5234689 RMD160 70e693e60c32edd33034b780808f715a77fa33e9 SHA1 20d3cb4a647c03e08d8e07f6911fccfaf260f6d3 SHA256 6a420676a8b8f141df5b89176665ca176de6ab776abca3f21898d4f6bb5b8ff2 DIST heimdal-1.2.1rc2.tar.gz 5235627 RMD160 0ed440beb3624d029491c2678e20a4b733a1c09c SHA1 66f623e6322fcb2555e32fe0941f95ff9147db81 SHA256 fe5aba1b48267fcbb469d3c1e9a36f72c50a973635344bd6cb188970ca11bc1b DIST heimdal-gentoo-patches-0.2.tar.bz2 5215 RMD160 f6b87d3caf8f156fdcf7c61542ea612cdcd42d9a SHA1 2282ea687e2cc215bf77a61b9badfb4a347b2792 SHA256 c4074b06760e28ac9a9bd5f1bc54dd86f1c104463384ca2f79918029995bb45a -EBUILD heimdal-1.1-r1.ebuild 2629 RMD160 60ebefd450805db8352c9f4a49f3bd91d7debd9b SHA1 789c7cbe40094860ced2ae0d8f1c4d4836928c46 SHA256 bc58c5a745b7b875318fac818ed6710bbee677ec2a8b9d61d582afee29c8f40d -EBUILD heimdal-1.1.ebuild 2617 RMD160 af88de92a675cb73e8397c518bc71f2e42fb5aae SHA1 35687814b1d2ac4d5ec94ceb0e482b52ef0e71bd SHA256 fa4d049f83ce9b8fe1370339b090145388d048c585405a55822c1308602ac6f0 -EBUILD heimdal-1.2.1.ebuild 4023 RMD160 dcb80c6619e4108fe8e67ea7202d03ea8f28e31d SHA1 8c2b3b5a9fd19102ddb3092f1b3073332ac8dbe4 SHA256 dfdba6be00ddeda1026a8c51b0161472a3d0cab794ec5df0460f3ed81633f557 -EBUILD heimdal-1.2.1_rc1-r1.ebuild 3893 RMD160 77ef5d85fa4aa583f002b6c101be0b466c3d71a1 SHA1 fe0c9dbb502834339df6172b9c0e0b741c219a0b SHA256 8d87448c5951b5dde4f19a8d1204b53d04536f12b643d2877f4d4a02093e7681 -EBUILD heimdal-1.2.1_rc1.ebuild 4425 RMD160 095b3f8a32d610b4a9f77903155bffafc37f4040 SHA1 5ca8542ec4daf6a730af317da861bb022b3083bf SHA256 7148cecc658a2ec9071e36e47a57d61560825cca6e060d53d818f2d4628bd60e -EBUILD heimdal-1.2.1_rc2-r1.ebuild 4036 RMD160 f5d730f844ee6bd65dabab6814dc1930b6fe7ba8 SHA1 869b36c18f40a23c18e74cb12f71bce5f82acc7c SHA256 4a14b42c154a1bb16c6aa399a3649687b8a8f332e484f6ef8849d4cb3c311502 -EBUILD heimdal-1.2.1_rc2-r2.ebuild 4084 RMD160 a5727d5ca516748feed248fa54b7639cad145ff3 SHA1 f8561e0e4956735d6b2b3e05532886edc52f93a7 SHA256 65e6a992e92de0de44ca964781e958ca15e5f19d3a2c859edb32a74fdfa431a6 -EBUILD heimdal-1.2.1_rc2-r3.ebuild 4093 RMD160 b3b60b28d57a6c63093009cea7e2657410c77464 SHA1 bcc5b4c74ccda57a288138cae66e3ff71abd65f3 SHA256 b9691d22e0d52df8b75982b8cb6795b229edd3873cbb2a26a3860cbd3498b436 -EBUILD heimdal-1.2.1_rc2-r4.ebuild 3731 RMD160 5b69cc8cef43011da5eafc7b22cc33dc9326a47c SHA1 a89f5e375be89bcae93df14867e0c0295554816b SHA256 7bd73d7a9387df360e9360af51e93d92f57caf71e18b8b286c29d34e9a811326 -EBUILD heimdal-1.2.1_rc2.ebuild 3963 RMD160 8099411893a9bba2d31386a9938b6cdb25cef4d6 SHA1 01a26d66a449464a074379858944617753ce917d SHA256 573cc06fefde0827b5364dcee63481c66b7b271d7b33443618548b3876506496 +EBUILD heimdal-1.1-r1.ebuild 2691 RMD160 c19a1cd574a0e6f1bc7f80c3a12b8d03da75988b SHA1 b5f20ddaece2e9eb0729c5abae94dd6cfd6e24ce SHA256 321624aa879b19ff94fa3c0ccf4adfe9bbc986058478f121c2f2feb8c4c4515c +EBUILD heimdal-1.1.ebuild 2679 RMD160 9b7f24b336d9ca54fa8b93b6ab09b73a6d6bb44c SHA1 518f27f491af31a6c052f2af828237e33971f13f SHA256 dd7d9ff6db3d875f80fa8d03c7054a32118bbfaaea75007d529608dd708013f8 +EBUILD heimdal-1.2.1.ebuild 4085 RMD160 64d44f43c46d61ae4e333527b79e1f0ce35362f9 SHA1 8ea77a102ac0de2bad184c14d46a70cc6e2f3085 SHA256 52a9a4601c87ab01b1ece7d89e672c2a5443709449694811d1030e03d55f167c +EBUILD heimdal-1.2.1_rc1-r1.ebuild 3955 RMD160 26ae6cf95adff0ceb9a8c7bfadfbb00a8c16ca73 SHA1 3583d72d68e965bbb1851028ea3b15a4a4688021 SHA256 f6846d6808194ac1b6e39381d168c37adf06d88c930e3e59197c35fa015d1669 +EBUILD heimdal-1.2.1_rc1.ebuild 4487 RMD160 e9d0d014f03e1670d11b0ef77f946cdadc9530c8 SHA1 022049ab26d6ba00d8a583638ca3ef2dfe06f08c SHA256 1704c76a6b333ee8b74658319ff96a8766463ae3e724513c1ca15d6669d53d55 +EBUILD heimdal-1.2.1_rc2-r1.ebuild 4098 RMD160 928eb80d97612ac5f21d478409b39429fe11d1f9 SHA1 bc2d4e5cea02d6f95935ff8e868e1a20770653bb SHA256 0c59869880c8af100a631b42b59ac2612eee8e2934c95f213bd06bd3c6b8d4df +EBUILD heimdal-1.2.1_rc2-r2.ebuild 4146 RMD160 c54186ad7c318160bf3d614adf2e1683ed60b36f SHA1 11a6bc60b630cc26b8f620a2da7de01dce0a7397 SHA256 8950dc53b003ae8756b59e15e3cbe57c76d2e963d17e6a375e3e088f19356ca6 +EBUILD heimdal-1.2.1_rc2-r3.ebuild 4155 RMD160 cf07635862e8931d3d25fb493aa015bc80322472 SHA1 be90c5f9ce7130e1903b7d157c9e58775edb4efd SHA256 c56861f6f64606294b77b173b6634230f8aa31e2734de51cbfb1ad9e001dc2d2 +EBUILD heimdal-1.2.1_rc2-r4.ebuild 3793 RMD160 77cefacd26e62a1965136ec903c614839e2451e0 SHA1 b01e883caca4f16ea85e2c9f30ef6acb86960fd8 SHA256 aa5960f194906428655f1ec8f8ab82d3eb4dc222ff635c90035c01bb23a0ca65 +EBUILD heimdal-1.2.1_rc2.ebuild 4025 RMD160 1f83a263d48281db556455296f25e4bc019202bc SHA1 f8ee36f7f2a90943a8c32ed26bb84da2fae0668f SHA256 7df35c874ade9e2e1c8aa5a74b06c2116edad9a89b5bb97537700ed84cee5f74 MISC metadata.xml 1086 RMD160 a5ee11683dbfe929a061ce2b4f1967ae61b86d5d SHA1 95cc60a2a78fb4cd71e336a9a05b47fdfa7d1715 SHA256 581e15be965c0fe6246010854acabb2fce21a7afdb9c669e46bacd5440514fec diff --git a/app-crypt/heimdal/heimdal-1.1-r1.ebuild b/app-crypt/heimdal/heimdal-1.1-r1.ebuild index e7c2a0b..d48b180 100644 --- a/app-crypt/heimdal/heimdal-1.1-r1.ebuild +++ b/app-crypt/heimdal/heimdal-1.1-r1.ebuild @@ -23,8 +23,8 @@ IUSE="ssl berkdb ipv6 X" # ldap" RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) sys-libs/cracklib !virtual/krb5" # ldap? ( net-nds/openldap )" diff --git a/app-crypt/heimdal/heimdal-1.1.ebuild b/app-crypt/heimdal/heimdal-1.1.ebuild index e3a90db..38cccc9 100644 --- a/app-crypt/heimdal/heimdal-1.1.ebuild +++ b/app-crypt/heimdal/heimdal-1.1.ebuild @@ -24,8 +24,8 @@ IUSE="ssl berkdb ipv6 ldap X" RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) sys-libs/cracklib !virtual/krb5" DEPEND="${RDEPEND}" diff --git a/app-crypt/heimdal/heimdal-1.2.1.ebuild b/app-crypt/heimdal/heimdal-1.2.1.ebuild index ff18352..57e47b9 100644 --- a/app-crypt/heimdal/heimdal-1.2.1.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1.ebuild @@ -25,8 +25,8 @@ RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !virtual/krb5" diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild index a4ddbcb..dbc4b60 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild @@ -23,8 +23,8 @@ IUSE="berkdb ipv6 ssl threads X pkinit otp" # ldap ldap-shared <- circular depen RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) !virtual/krb5" # Sry for that - still have no cute solution to break circular dependency # I also want to point at http://www.h5l.org/manual/heimdal-1-1-branch/info/heimdal.html#Using-LDAP-to-store-the-database diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild index bb50ed5..849de0d 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild @@ -24,8 +24,8 @@ IUSE="berkdb ipv6 pkinit ssl threads X" # ldap ldap-shared <- circular dependenc RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) sys-libs/cracklib !virtual/krb5" # Sry for that - still have no cute solution to break circular dependency diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc2-r1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc2-r1.ebuild index 5ed723c..a8c6651 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc2-r1.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc2-r1.ebuild @@ -23,8 +23,8 @@ IUSE="berkdb ipv6 ssl threads X pkinit otp afs" # ldap ldap-shared <- circular d RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) afs? ( net-fs/openafs ) !virtual/krb5" diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc2-r2.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc2-r2.ebuild index df15d67..ba4bfc1 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc2-r2.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc2-r2.ebuild @@ -23,8 +23,8 @@ IUSE="berkdb ipv6 ssl threads X pkinit otp afs" # ldap ldap-shared <- circular d RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) afs? ( net-fs/openafs ) !virtual/krb5" diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc2-r3.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc2-r3.ebuild index eac27df..0b73a49 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc2-r3.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc2-r3.ebuild @@ -23,8 +23,8 @@ IUSE="berkdb ipv6 ssl threads X pkinit otp afs" # ldap ldap-shared <- circular d RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) afs? ( net-fs/openafs ) !virtual/krb5" diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc2-r4.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc2-r4.ebuild index 77bc952..f5d0901 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc2-r4.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc2-r4.ebuild @@ -23,8 +23,8 @@ IUSE="berkdb ipv6 ssl threads X pkinit otp afs hdb-ldap" RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) !virtual/krb5" diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc2.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc2.ebuild index cf9d1d4..6b0b160 100644 --- a/app-crypt/heimdal/heimdal-1.2.1_rc2.ebuild +++ b/app-crypt/heimdal/heimdal-1.2.1_rc2.ebuild @@ -23,8 +23,8 @@ IUSE="berkdb ipv6 ssl threads X pkinit otp afs" # ldap ldap-shared <- circular d RDEPEND="ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) >=dev-db/sqlite-3.5.7 - sys-libs/ss - sys-libs/com_err + || ( sys-libs/ss sys-libs/e2fsprogs-libs ) + || ( sys-libs/com_err sys-libs/e2fsprogs-libs ) afs? ( net-fs/openafs ) !virtual/krb5" -- 1.5.6.4