public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in kde-base/akonadi: ChangeLog akonadi-4.3.4.ebuild
@ 2009-12-01  9:55 Alex Alexander (wired)
  0 siblings, 0 replies; 4+ messages in thread
From: Alex Alexander (wired) @ 2009-12-01  9:55 UTC (permalink / raw
  To: gentoo-commits

wired       09/12/01 09:55:21

  Modified:             ChangeLog
  Added:                akonadi-4.3.4.ebuild
  Log:
  Version bump KDE 4.3.4
  (Portage version: 2.2_rc54/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.43                 kde-base/akonadi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	30 Nov 2009 06:54:53 -0000	1.42
+++ ChangeLog	1 Dec 2009 09:55:21 -0000	1.43
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.42 2009/11/30 06:54:53 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.43 2009/12/01 09:55:21 wired Exp $
+
+*akonadi-4.3.4 (01 Dec 2009)
+
+  01 Dec 2009; Alex Alexander <wired@gentoo.org> +akonadi-4.3.4.ebuild:
+  Version bump
 
   30 Nov 2009; Joseph Jezak <josejx@gentoo.org> akonadi-4.3.3.ebuild:
   Marked ppc/ppc64 stable for bug #292455.



1.1                  kde-base/akonadi/akonadi-4.3.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.1&content-type=text/plain

Index: akonadi-4.3.4.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.1 2009/12/01 09:55:21 wired Exp $

EAPI="2"

if [[ ${PV} = *9999* ]]; then
	KMNAME="kdepim"
	eclass="kde4-meta"
else
	KMNAME="kdepim-runtime"
	eclass="kde4-base"
fi
inherit ${eclass}

DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# add when libmapi becomes available with an ebuild
#exchange
IUSE="debug +semantic-desktop"

# add when libmapi becomes available with an ebuild
#exchange? ( net-libs/libmapi )
DEPEND="
	dev-libs/boost
	dev-libs/libxml2
	dev-libs/libxslt
	$(add_kdebase_dep kdelibs 'semantic-desktop?')
	$(add_kdebase_dep kdepimlibs)
	x11-misc/shared-mime-info
"
RDEPEND="${DEPEND}
	>=app-office/akonadi-server-1.2.1
"

# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
add_blocker kdemaildir
add_blocker kdepim-kresources '<4.2.95'

[[ ${KMNAME} = "kdepim-runtime" ]] && S="${WORKDIR}/${KMNAME}-${PV}"

src_prepare() {
	local pref="${S}"
	[[ ${KMNAME} != "kdepim-runtime" ]] && pref="${S}/${PN}"
	if ! use semantic-desktop; then
		sed -i -e "s/add_subdirectory( nepomuktag )//"\
			"${pref}"/resources/CMakeLists.txt\
			|| die "Failed to disable nepomuktag"
	fi

	${eclass}_src_prepare
}

src_configure() {
	# Set the dbus dirs, otherwise it searches in KDEDIR
	mycmakeargs="${mycmakeargs}
		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces
		-DAKONADI_DBUS_SERVICES_INSTALL_DIR=/usr/share/dbus-1/services"
	# replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild
	mycmakeargs="${mycmakeargs}
		-DWITH_LibXslt=ON
		-DWITH_OpenChange=OFF
		-DWITH_GNOKII=OFF
		-DWITH_GLIB2=OFF
		-DWITH_OpenSync=OFF
		$(cmake-utils_use_with semantic-desktop Nepomuk)
		$(cmake-utils_use_with semantic-desktop Soprano)"

	${eclass}_src_configure
}

src_test() {
	# disable broken tests
	sed -i -e '/kcalserializertest/ s/^/#DO_NOT_RUN_TEST /' \
		"${S}"/plugins/tests/CMakeLists.txt || \
		die "sed to disable kcalserializertest failed."
	sed -i -e '/kresmigrationtest/ s/^/#DO_NOT_RUN_TEST /' \
		"${S}"/migration/kres/tests/CMakeLists.txt || \
		die "sed to disable kresmigrationtest failed."

	${eclass}_src_test
}

src_install() {
	${eclass}_src_install
	# colliding files with nepomuk
	rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-base/akonadi: ChangeLog akonadi-4.3.4.ebuild
@ 2009-12-22 22:31 Jonathan Callen (abcd)
  0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Callen (abcd) @ 2009-12-22 22:31 UTC (permalink / raw
  To: gentoo-commits

abcd        09/12/22 22:31:03

  Modified:             ChangeLog akonadi-4.3.4.ebuild
  Log:
  Pull in changes from overlay and prefix support
  (Portage version: -svn/cvs/Linux i686)

Revision  Changes    Path
1.46                 kde-base/akonadi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?r1=1.45&r2=1.46

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	10 Dec 2009 18:55:49 -0000	1.45
+++ ChangeLog	22 Dec 2009 22:31:03 -0000	1.46
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.45 2009/12/10 18:55:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.46 2009/12/22 22:31:03 abcd Exp $
+
+  22 Dec 2009; Jonathan Callen <abcd@gentoo.org> akonadi-4.3.4.ebuild:
+  Pull in changes from overlay and prefix support
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -akonadi-4.3.1.ebuild:



1.2                  kde-base/akonadi/akonadi-4.3.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?r1=1.1&r2=1.2

Index: akonadi-4.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akonadi-4.3.4.ebuild	1 Dec 2009 09:55:21 -0000	1.1
+++ akonadi-4.3.4.ebuild	22 Dec 2009 22:31:03 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.1 2009/12/01 09:55:21 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.2 2009/12/22 22:31:03 abcd Exp $
 
 EAPI="2"
 
@@ -52,19 +52,20 @@
 }
 
 src_configure() {
-	# Set the dbus dirs, otherwise it searches in KDEDIR
-	mycmakeargs="${mycmakeargs}
-		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces
-		-DAKONADI_DBUS_SERVICES_INSTALL_DIR=/usr/share/dbus-1/services"
-	# replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
+		# Set the dbus dirs, otherwise it searches in KDEDIR
+		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
+		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
+
 		-DWITH_LibXslt=ON
+		# replace with $(cmake-utils_use_with exchange OpenChange) when libmapi becomes available with an ebuild
 		-DWITH_OpenChange=OFF
 		-DWITH_GNOKII=OFF
 		-DWITH_GLIB2=OFF
 		-DWITH_OpenSync=OFF
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)"
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
 
 	${eclass}_src_configure
 }
@@ -84,5 +85,5 @@
 src_install() {
 	${eclass}_src_install
 	# colliding files with nepomuk
-	rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
+	rm -rf "${ED}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
 }






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-base/akonadi: ChangeLog akonadi-4.3.4.ebuild
@ 2009-12-23 11:45 Fabian Groffen (grobian)
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen (grobian) @ 2009-12-23 11:45 UTC (permalink / raw
  To: gentoo-commits

grobian     09/12/23 11:45:19

  Modified:             ChangeLog akonadi-4.3.4.ebuild
  Log:
  Fix accidential rm from root filesystem, ED is not defined here
  (Portage version: 2.2.00.15134-prefix/cvs/Darwin powerpc, RepoMan options: --force)

Revision  Changes    Path
1.47                 kde-base/akonadi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?r1=1.46&r2=1.47

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog	22 Dec 2009 22:31:03 -0000	1.46
+++ ChangeLog	23 Dec 2009 11:45:19 -0000	1.47
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.46 2009/12/22 22:31:03 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.47 2009/12/23 11:45:19 grobian Exp $
+
+  23 Dec 2009; Fabian Groffen <grobian@gentoo.org> akonadi-4.3.4.ebuild:
+  Fix accidential rm from root filesystem, ED is not defined here
 
   22 Dec 2009; Jonathan Callen <abcd@gentoo.org> akonadi-4.3.4.ebuild:
   Pull in changes from overlay and prefix support



1.3                  kde-base/akonadi/akonadi-4.3.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?r1=1.2&r2=1.3

Index: akonadi-4.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akonadi-4.3.4.ebuild	22 Dec 2009 22:31:03 -0000	1.2
+++ akonadi-4.3.4.ebuild	23 Dec 2009 11:45:19 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.2 2009/12/22 22:31:03 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.3 2009/12/23 11:45:19 grobian Exp $
 
 EAPI="2"
 
@@ -85,5 +85,5 @@
 src_install() {
 	${eclass}_src_install
 	# colliding files with nepomuk
-	rm -rf "${ED}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
+	rm -rf "${D}"/${EKDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
 }






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-base/akonadi: ChangeLog akonadi-4.3.4.ebuild
@ 2010-01-23 20:10 Jonathan Callen (abcd)
  0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Callen (abcd) @ 2010-01-23 20:10 UTC (permalink / raw
  To: gentoo-commits

abcd        10/01/23 20:10:39

  Modified:             ChangeLog akonadi-4.3.4.ebuild
  Log:
  Keyword ~amd64-linux/~x86-linux
  (Portage version: -svn/cvs/Linux i686)

Revision  Changes    Path
1.49                 kde-base/akonadi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/ChangeLog?r1=1.48&r2=1.49

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog	19 Jan 2010 02:31:29 -0000	1.48
+++ ChangeLog	23 Jan 2010 20:10:39 -0000	1.49
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.48 2010/01/19 02:31:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.49 2010/01/23 20:10:39 abcd Exp $
+
+  23 Jan 2010; Jonathan Callen <abcd@gentoo.org> akonadi-4.3.4.ebuild:
+  Keyword ~amd64-linux/~x86-linux
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org> akonadi-4.3.3.ebuild:
   Stable for HPPA too.



1.4                  kde-base/akonadi/akonadi-4.3.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild?r1=1.3&r2=1.4

Index: akonadi-4.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- akonadi-4.3.4.ebuild	23 Dec 2009 11:45:19 -0000	1.3
+++ akonadi-4.3.4.ebuild	23 Jan 2010 20:10:39 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.3 2009/12/23 11:45:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.3.4.ebuild,v 1.4 2010/01/23 20:10:39 abcd Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@
 inherit ${eclass}
 
 DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 # add when libmapi becomes available with an ebuild
 #exchange
 IUSE="debug +semantic-desktop"






^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-01-23 20:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-23 20:10 [gentoo-commits] gentoo-x86 commit in kde-base/akonadi: ChangeLog akonadi-4.3.4.ebuild Jonathan Callen (abcd)
  -- strict thread matches above, loose matches on Subject: below --
2009-12-23 11:45 Fabian Groffen (grobian)
2009-12-22 22:31 Jonathan Callen (abcd)
2009-12-01  9:55 Alex Alexander (wired)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox