Also add 4.7.3 revision of the imap4 protocol regression fix, bug 382411.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 95 insertions, 15 deletions

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 1b51ff6af646..a3b140303417 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.121 2011/12/15 23:59:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.122 2011/12/17 00:17:19 dilfridge Exp $
+
+*kdepimlibs-4.7.3-r1 (17 Dec 2011)
+
+  17 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepimlibs-4.7.3-r1.ebuild:
+  Also add 4.7.3 revision of the imap4 protocol regression fix, bug 382411.
 
 *kdepimlibs-4.7.4-r1 (15 Dec 2011)
 
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index 062cc33ed65e..2529b626775c 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -8,25 +8,26 @@ DIST kdepimlibs-4.7.3.tar.bz2 3233484 RMD160 468d972ea73499c6cca6c10fdb3b6e84cee
 DIST kdepimlibs-4.7.4.tar.bz2 3236435 RMD160 d7b879a4a24f1878f36d9b9418464b55cbc0d3ce SHA1 a539e29557c0a30779e752b9349b3a0c000ffbba SHA256 37c2a5903b6ed8f5b10ade3696dd43bcc7515b10dd8f75d157d3ed7e019bee66
 EBUILD kdepimlibs-4.6.3.ebuild 2168 RMD160 720422fcbf74ce80de9520dcde15d90312f6ac3c SHA1 b1a47bd45ca0bd1a485bda11c16891c803027a19 SHA256 8cf38ebb729b42a5b2185f62997f6b91f964684c0065a6a9cd7d48884ef035fb
 EBUILD kdepimlibs-4.6.5.ebuild 2169 RMD160 4c2c48cd56bf7234c9cb3e9536694e3d8f36dc38 SHA1 89d00bef83b75464774e811380135ee269acbe29 SHA256 46b9af85c625d6690b4057977b788439585acf0f65994321e2bae0a40a2132c6
+EBUILD kdepimlibs-4.7.3-r1.ebuild 2082 RMD160 5da77a466b6c5d6f6871df9cad0f4481431bc794 SHA1 29fd7c6eb41938e2c19e2c97e886325dbc548f19 SHA256 0ccbd266ce958776d4ecf122f86ea88b2ffafb928cf17411482d096d5d5a8f74
 EBUILD kdepimlibs-4.7.3.ebuild 2025 RMD160 85e0a1f7dfed279948593ca0bebd683028ecab58 SHA1 a2645ad1873fd9223137985b39ce9fb1384a56ec SHA256 ec1a4170475860f9d77888dd276ff83a5f9b86384598a1f2f5cf34a90d2bb336
 EBUILD kdepimlibs-4.7.4-r1.ebuild 2082 RMD160 f25420bc578d3edda5a11e1d2b37703b1eab3cdd SHA1 e4e0b831a58818e670db9571e59f0cd19938b5fe SHA256 8e995275869c7d859ea9af7f87a54e99c9e9cc3d66e2015318bf3e7c126f2af2
 EBUILD kdepimlibs-4.7.4.ebuild 2025 RMD160 6fab03bd3ca9138242ce2992bf08dac2c4df4c2b SHA1 a48e64fe8b03a71c7f7c9608802e410a00fdf31c SHA256 bb79aec9df6bc1561a5ca0b790b5117ff923355ee4bdc0f41e14bbfee8dc4f8f
-MISC ChangeLog 15694 RMD160 4374e5f1c816e9b28e83b304f285cb92b2d408c2 SHA1 09a8f391fe2b46a3c85365e7fcf8257406cf06ed SHA256 d490e1bff45c08b217da491f65c7bf97c5942af5c1e90cace018e0724809e1d1
+MISC ChangeLog 15895 RMD160 a08f2cce0e5469afb557c51b655853c1ce2effba SHA1 0a7e51f19ba1b8f2de404e55ee0c7605438c18be SHA256 589ee7810861a7c3b210c9c5270796d681dba2c0ca3f652dd8876b7ec7db239f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO6onnAAoJENwGBM22xffey9cP/Ah9DqU6drDkguK1coo5pPhs
-mCYCJO834N3zPlJ9TQQoKSr+R+3yUyW6v3eX8zcpSL9h7lwEz7I7UffxKSc1hwp5
-OyxmKvSHeq8EUj0DBXKvt1qCdf1H9hpimfPCnd8X4ykpquOEtInSF0cS5vDeLKJb
-NYwf+hNhLFADUi6eQL/V4vkW4qtT4XuNtlqU/vMJaIH0OSTn+CXrfZlduBXRibds
-pDtPzNqaXLWEn968xobRXJT+YMcb6MCEMm8iwvpfbn06uW+Dc8U2XexueHstBW9I
-eK/yCcSkzo5L4EBr8VyuPc0DE91ILIoV9j5Fdi5jD4aN7+ol2zT4g7Ts+noG09T8
-a+ErMBoQlNPr3BnAC3m42OXdC72yv4lzQ+y3JJTdV5EMZf1AOCCygFYCQX1LJUgW
-eLHltrqkc/QncTVsc8D3ZA4OJpwHUvTR9u1DEXqKKaqGZmpMxZN2auswYq4i0Ue2
-L69BpJ2wCsj6H2TnwyuDKUR6zSDA+8xKmM6eU7g8o+VJ+NYTDf3br2EMffIpxJBl
-CLVL4zTfC5WoeQ0LYI9O7a+DVe1BE9fpW71O6VETJobZirgJthCXRY5NvpVdaAQQ
-A6E6FdjVS7Ybn/ugn79reFZ4YDAp0r4XClKq32qGNZlEJE5Fij1jp/zj6/x1nAF+
-Xq4Ph2Q8BsG1p+XZH7UJ
-=5IoA
+iQIcBAEBCgAGBQJO69+gAAoJENwGBM22xffeOmoQAKFcI3pdCev0FGs4DePoJzPS
+KwOm2WAhcrFLhVwQRp7Mh56kHZL1d82WumujE2PptIeyirX4xg9G+Vs4jtjYhLrv
+n0PdHU5e5nDCWCPXgNpCpz7j3UMLfcNKvu99cIXKjz1L+YsaZSkOdEaoVQERJ1kG
+dZVVQsm+833llbPbC9dSOPEDjDFSCRpek2RNSOQLbnNTiUyo5Ot390WjXYI8cVU4
+xIzCoJAMwkcds1MogNVd1igoFiGYkigxo6jDPVoylo57z4zcTNMAGNA1J0kUZEms
+5qP8UXp6bg1OHabIhLzxiwxr/PpEdGKu5PsyJO2aNDHP/udYn6Qjc7SLUqiLzgdY
+yFxOWpG44iZSJMMeQhIZh/6/T0mc+0LNAEL9MQkLYoOrW6bodYevhs/hCfNBg5jy
+jHAaErW0cHEkZO/TCoxipsVhWomLEiz2mGpawxIXljvBWe6PSQ2rTLAgJwhOe2Ax
+ja14tu7yBSufOnoRuCYJLJ6n88zxaVxmYCJym29yj+pSoLaN/q2n2zKohW4al1EA
+FUB9aZ1eLAcUmdXdRa6Fmp47rg/hluH9ctmuWQ4mCCG8hMOJAqkMAil8xa1eRqQn
+Xtvi3mEpnXVWpIXMNhYwP64VjF2Fti69ZrBKtpmNnr12BsoQxmNgXLcTf5bZvVzn
+H9dLCENQNB+T5o+yk/EF
+=Jm+i
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild
new file mode 100644
index 000000000000..b9d182ab4ff6
--- /dev/null
+++ b/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.7.3-r1.ebuild,v 1.1 2011/12/17 00:17:19 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap semantic-desktop"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.1.6
+	dev-libs/libgpg-error
+	>=dev-libs/libical-0.43
+	dev-libs/cyrus-sasl
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	semantic-desktop? (
+		>=app-office/akonadi-server-1.5.80
+		media-libs/phonon
+		x11-misc/shared-mime-info
+	)
+	ldap? ( net-nds/openldap )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.35.0-r5
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.4-size.patch"
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# Disable hardcoded checks
+	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
+		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
+		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+		-i CMakeLists.txt || die
+	if ! use semantic-desktop; then
+		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
+			-i CMakeLists.txt || die
+		# More reliable than -DBUILD_akonadi=OFF
+		rm -r akonadi mailtransport || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_with ldap)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		# $(cmake-utils_use_with prison)
+		-DWITH_Prison=NO
+	)
+
+	kde4-base_src_configure
+}