Allow kpilot to be built again, now that pilot-link-0.12.2 is in the tree and unmasked. cf. bug 163853.

Package-Manager: portage-2.1.3.9

4 files changed, 100 insertions, 9 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 301fbbc8c8c8..f66b54aa40ac 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.288 2007/09/01 17:49:37 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.289 2007/09/22 12:47:47 philantrop Exp $
+
+*kdepim-3.5.7-r4 (22 Sep 2007)
+
+  22 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +kdepim-3.5.7-r4.ebuild:
+  Allow kpilot to be built again, now that pilot-link-0.12.2 is in the tree
+  and unmasked. cf. bug 163853.
 
   01 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   kdepim-3.5.7-r3.ebuild:
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 68be6e9f734e..5ee47be1fb19 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -75,14 +75,18 @@ EBUILD kdepim-3.5.7-r3.ebuild 2335 RMD160 444f1c302b93b14abb908652b2626f81c1a3d4
 MD5 644b053e7e814e5c4346f42f7ab22e39 kdepim-3.5.7-r3.ebuild 2335
 RMD160 444f1c302b93b14abb908652b2626f81c1a3d4cc kdepim-3.5.7-r3.ebuild 2335
 SHA256 2776a7029e507a076ff6893e6547aea432945615c870fcb746dd86b728e80c33 kdepim-3.5.7-r3.ebuild 2335
+EBUILD kdepim-3.5.7-r4.ebuild 2316 RMD160 442f6db3a1ef360b714e981e44871eba2ad9e99e SHA1 b333a619f596b7a6bb7901089d48924145599d59 SHA256 f4043a6ba793071f285e7fa07e4bb5fc812ff05ce1dc35ee64bbcc161b0088d2
+MD5 4d6f312d20b0fcf02913cc1963956cfb kdepim-3.5.7-r4.ebuild 2316
+RMD160 442f6db3a1ef360b714e981e44871eba2ad9e99e kdepim-3.5.7-r4.ebuild 2316
+SHA256 f4043a6ba793071f285e7fa07e4bb5fc812ff05ce1dc35ee64bbcc161b0088d2 kdepim-3.5.7-r4.ebuild 2316
 EBUILD kdepim-3.5.7.ebuild 1990 RMD160 0caa91220439228cf239b03d2bbeba09f607cd0a SHA1 7fe7c84ab5bb1a91b3ab36ccfc175baa4763ce00 SHA256 71efc0f31dce702223cfe56686b41e193b1cfaddb28164e13fb764d2be76340a
 MD5 3272d97b271caa13f242a6c6d6e608ea kdepim-3.5.7.ebuild 1990
 RMD160 0caa91220439228cf239b03d2bbeba09f607cd0a kdepim-3.5.7.ebuild 1990
 SHA256 71efc0f31dce702223cfe56686b41e193b1cfaddb28164e13fb764d2be76340a kdepim-3.5.7.ebuild 1990
-MISC ChangeLog 39399 RMD160 4f86764021c6fae72ba3bd1f8c8a67cf63638d34 SHA1 b9b5daa023d7e11a7c32cc7034189b59a9c1a5fe SHA256 8643b02cb500873f8007db26a9ae5bbdc0d53be5dec4c17a370ac2ec47c85438
-MD5 0c24b440334e7f425988bbba30709e01 ChangeLog 39399
-RMD160 4f86764021c6fae72ba3bd1f8c8a67cf63638d34 ChangeLog 39399
-SHA256 8643b02cb500873f8007db26a9ae5bbdc0d53be5dec4c17a370ac2ec47c85438 ChangeLog 39399
+MISC ChangeLog 39622 RMD160 44ea6d3dd4a257547b403fcfe0055a7c7b1c3f89 SHA1 acd7696f21133dccf432c0d4381f34359cb6ee49 SHA256 7eab40f5cc5f9611f9ee6fa095aa541ab45f2c320a493ce010a618a91a5779c4
+MD5 255107150555526b39d00a32ac9f0d59 ChangeLog 39622
+RMD160 44ea6d3dd4a257547b403fcfe0055a7c7b1c3f89 ChangeLog 39622
+SHA256 7eab40f5cc5f9611f9ee6fa095aa541ab45f2c320a493ce010a618a91a5779c4 ChangeLog 39622
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -117,10 +121,13 @@ SHA256 e2d72a2f91c943cdee1c55c196f4e64591c7568eeae58d52df0dc277921bf345 files/di
 MD5 43b28fdf5a7d3a768048ecd296a3222b files/digest-kdepim-3.5.7-r3 518
 RMD160 d77a6b565deebc1d08b5c2dea6f8e144e65fb7e4 files/digest-kdepim-3.5.7-r3 518
 SHA256 06b7519477dcd87ec33c5bedecb84f0b2209cfe37d1e01ff04f7a33e2604b4c8 files/digest-kdepim-3.5.7-r3 518
+MD5 43b28fdf5a7d3a768048ecd296a3222b files/digest-kdepim-3.5.7-r4 518
+RMD160 d77a6b565deebc1d08b5c2dea6f8e144e65fb7e4 files/digest-kdepim-3.5.7-r4 518
+SHA256 06b7519477dcd87ec33c5bedecb84f0b2209cfe37d1e01ff04f7a33e2604b4c8 files/digest-kdepim-3.5.7-r4 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG2aY4CkvF58q80IkRAkC8AJ9EJQWogM7XjzUzAX1oDWMtcDl6lACZAWdY
-UtJBl9I3pZC+8yliYAq53ME=
-=afTL
+iD8DBQFG9Q8BCkvF58q80IkRAhuJAKCR5260WHVX+z5gKwQAionm9plSkACfWfUJ
+EgWvCY5v9MGUKktWUx3hgLk=
+=MTXl
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.7-r4 b/kde-base/kdepim/files/digest-kdepim-3.5.7-r4
new file mode 100644
index 000000000000..c779ca922394
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.5.7-r4
@@ -0,0 +1,6 @@
+MD5 bf6b46337388fa6a93c9084d3d2c4509 kdepim-3.5-patchset-04.tar.bz2 133990
+RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba kdepim-3.5-patchset-04.tar.bz2 133990
+SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61 kdepim-3.5-patchset-04.tar.bz2 133990
+MD5 8571db6dcf4168614c96bb72c493f931 kdepim-3.5.7.tar.bz2 14166061
+RMD160 14c05d4620abf1eb5421ad434dc63f037069e930 kdepim-3.5.7.tar.bz2 14166061
+SHA256 9d981d372f1822662e102b6f84f046e4df771641fc4d041aae81b8fafd47b32e kdepim-3.5.7.tar.bz2 14166061
diff --git a/kde-base/kdepim/kdepim-3.5.7-r4.ebuild b/kde-base/kdepim/kdepim-3.5.7-r4.ebuild
new file mode 100644
index 000000000000..64eee75d3a0b
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.5.7-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.7-r4.ebuild,v 1.1 2007/09/22 12:47:47 philantrop Exp $
+
+inherit kde-dist
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdepim-3.5-patchset-04.tar.bz2"
+
+DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pda gnokii"
+
+RESTRICT="test"
+
+# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	gnokii? ( app-mobilephone/gnokii )
+	>=app-crypt/gpgme-1.1.2-r1
+	|| ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )
+	x11-libs/libXScrnSaver
+	app-pda/libopensync
+	pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )"
+
+RDEPEND="${DEPEND}
+		app-crypt/pinentry"
+
+DEPEND="${DEPEND}
+	x11-proto/scrnsaverproto
+	x11-apps/xhost"
+
+src_unpack() {
+	kde_src_unpack
+	# Call Qt 3 designer
+	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
+
+	# disabling tests, see bug #164038 and bug #164097
+	sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" \
+		-i libkcal/Makefile.am || die "sed failed" || die "sed failed"
+# 	sed -e "s:SUBDIRS = . plugins test:SUBDIRS = . plugins:" \
+# 		-i kitchensync/libkonnector2/Makefile.am || die "sed failed"
+# 	sed -e "s:SUBDIRS = . tests test:SUBDIRS = .:" \
+# 		-i kitchensync/libksync/Makefile.am || die "sed failed"
+
+	sed -e "s:check_PROGRAMS = testalarmdlg:check_PROGRAMS =:" \
+		-i korganizer/korgac/Makefile.am || die "sed failed"
+
+	if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then
+		einfo "User ${USER} has no X access, disabling some tests."
+		sed -e "s:tests::" -i libkdepim/Makefile.am || die "sed failed"
+	fi
+}
+
+src_compile() {
+	local myconf="--with-sasl $(use_with gnokii)"
+	myconf="${myconf} --with-gpg=/usr/bin/gpg"
+
+	use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+	# DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	ewarn "If you're using x11-misc/basket, please re-emerge it now to avoid crashes with Kontact."
+	ewarn "cf. https://bugs.gentoo.org/show_bug.cgi?id=174872 for details."
+}