version bump

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 177 insertions, 9 deletions

diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index 3988218d0f22..6519849a3743 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/geary
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.2 2013/05/30 13:45:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.3 2013/08/27 00:53:24 hasufell Exp $
+
+*geary-0.4.0_pre1 (27 Aug 2013)
+
+  27 Aug 2013; Julian Ospald <hasufell@gentoo.org> +geary-0.4.0_pre1.ebuild,
+  +files/geary-0.4.0_pre1-cflags.patch, +files/geary-0.4.0_pre1-unity.patch:
+  version bump
 
   30 May 2013; Julian Ospald <hasufell@gentoo.org> geary-0.3.1.ebuild:
   fix homepage
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 20ff50901ce6..c06637348b18 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -3,18 +3,22 @@ Hash: SHA256
 
 AUX geary-0.3.1-ayatana.patch 1308 SHA256 1b1220df7d9ec12ca8ef01c4a476023d5b2a2b01b30da6523f58b2dcb9bbb1f9 SHA512 bcc57fb0e1ecd40002937595814b598398c2b40ce589790a05d0bbf6388b60ff433fb8f7e949ea767b76f26b09f278f910f21cae54d16167bee13f7363a2470d WHIRLPOOL cc1d511e81f20110f9c7870d356966e9d957c39bf82a64f36799d3f55e7e8d0a8bb7cde8580b666bcee174a14c9cc3dada189e47ab599c294dc27687e8dcb68e
 AUX geary-0.3.1-cflags.patch 563 SHA256 ad9292af801d1ad276d70891d6dba69b0af7d7177fc3556692320e414d76bd84 SHA512 b6b605bc0bdd677b38f7f53ce548bbaabad721844d044ea486ef9a85fe34c26c45462b0dc077c27c194532dfa787ee648e633da02de0daee2ca55fc0c5dfe3cb WHIRLPOOL dfbc539858b4f50353a49f8e02e109ca02939655b591bac361abce33288796231eafd1c5b8f303098995d087168c7f7c9f227c81453f854e43da26e4fd0aaa77
+AUX geary-0.4.0_pre1-cflags.patch 682 SHA256 73eca296cf317759da4d67e650a315ff8bfc03bb638d9e9deb2a63da1192a63a SHA512 760e83d6262bb09dad8da61dba829c024377a44da78542c943481d02907f82903e97b2256aed7f6d7ef76c0ff3df39068d4fe8aab26369855369f2b7bca99c05 WHIRLPOOL e16afff6881948e6bcd7092d4d2eed7db859bf3c4653f774b11228bfe77cc562349e7ffae1c806242284c9901fdafe57fbcac9fafb47c3c534b96a2bc73abe15
+AUX geary-0.4.0_pre1-unity.patch 1030 SHA256 af9e813b6c019770b35a2bc4c0c55639a825c7a80101d98ed62ac650a8127e55 SHA512 4f45358ae2821e190892ba9329e692f6eb8c53cfa470ff0e1f4ba7ebbce4a2ae52c3ec1414247fa1a214ea63e88256a5086a40aa7c0fa3da745d33d7908fe401 WHIRLPOOL 81db73490e21696f936679aa40eaddfddd02eb8e755ebd690a61872504364dd856bfe8449681bf545582dcf154b8b3d9d077bfa3f3c694ecc98dcbc7717375f7
 DIST geary-0.3.1.tar.xz 499832 SHA256 a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed SHA512 a15c21eeebe2ce72bbcdbf27f4290b1385633a72f31f764505e20ffa037afd9089ce774069892479ee04c49a29a56ecab3b1b9b4907a2e26c970ab25fe5a4f3f WHIRLPOOL c3ef67206f76390cff44d056316a1ad8d16272d7af82afa2652b513c454cff77d95112a83d758f74f2df4c4b8c048383d3018e878b94d2f7b3a3e695f32e2f51
+DIST geary-0.4.0pr1.tar.xz 548052 SHA256 d2779f3f7d8ac84511f66e81489ca02090383cf0e448a7b15e7065414c4e7617 SHA512 e962388b84b9318c7818ce09adf0f7bbd8af0eb0cee20ddf9cae5e2d05069aad8f2c722299a7f512ea98f22295c165124db46dd263333236082560281467d8b4 WHIRLPOOL e21d0be9d6f12212cdde06aabb571238664272464eefa128720309c63f4f343be62d2ef35c7d6ab816311bacb463acd7801cd5f73cab9f8935fa279c97e5fbbf
 EBUILD geary-0.3.1.ebuild 2216 SHA256 71f21eb35f0707585eb6744aa6b7d3527d56c1dbf69e93dbebff7d91ea7443ca SHA512 ea78d42e383f2895ceb62311596b84a678091c939e441777119b1263a92cfea3fbe3b30c201919d56348bb4112125118d097622a35e8e3ec0482dc673cc36583 WHIRLPOOL 27105e06b2a5764dbbdb6d4560a79cf7d727e9116800cb9002664529a08a1ad53f4635cf433780671b8d91b66aff9f2c4bf1f331a76e0bbd3f785bacec524227
-MISC ChangeLog 511 SHA256 b9c2693fbf1fb576661bfbcd023bbccec1631bb12f16b875d6125a4393c40028 SHA512 680d1964cb81f00777f3e78f8c1997fa53dba77ea8df07b4488adaef79908af81fdb1a30d2444b74c508fa1d6c23d5adfb0dfb57f80cbb4fb2d879ed493d79ed WHIRLPOOL 1e584eaf2055f4b797769b63de8aaf9c8bc83c84f2ce1129c94fd8f32c24f83a2089175b5116b7532b60a198f3996eb6baa9a23b0ca0f4e2e5fb22fc6d976c61
+EBUILD geary-0.4.0_pre1.ebuild 2209 SHA256 f3a6272cb3d34a23742c26c865cdd714c6b32ca5c3df9cacf2291c9244f00b7b SHA512 e293b5f10790702bd46d9213d0d9b149f8a8861162aee98182198a6b8fcb9be302eb1f01415642460b72f896b124cb0c605fb9b9c30c62b5fecf0b4c79fbdfbe WHIRLPOOL 71fc70e0f15e83fab27db920b174a8b49835b46469b68ada66cea175f3ad1244f2c2cc0c2cddb73e29f49f87bf370d766195ae14dd55a656d5b88efbbf2e6522
+MISC ChangeLog 714 SHA256 b45c7839fba4a49ffaf95b297630a2d2efb3bc19db40a8e2e89503725f362705 SHA512 f4aeb9abfbd75ebc62049a32d64921f315e9a933ec2d2849ad81c32c11461d495fe156455778f055d8c7debd0d1007bc477a8f0d392b82ed4c388886a13f6505 WHIRLPOOL cdb829a8b730d553f0da46af12079e75bf5c34ebab2b8e78b81d9b3cb46a6364ee90f8e5e945faa4d208a738de074e373758c66a3b0b2100e561f814ce756718
 MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRp1flAAoJEFpvPKfnPDWzvXYH/0IVsH345eoXJxEz/srLHALq
-1PIqZORzlnDnsmNUxhPf+PXPCFeoTo4aVsTaE3jPGJxz7Ci+sgv/SLrvd5rUQVkc
-aCodRWxexhulYDe7DE0uH/fAMGw41FEukSe7NGuCKaMQiKZM25sgBc5NmH8mgCY4
-QCwXqWXjfubDfW0kyV0BpNHAcJZX+Dfo5lj+cjbomjt/MfC8YU+S6MlFu6y5bAyx
-vnK2SULq5EqsZ0Xs6mZaZbiMtwEt3JwiXzR3VhhbpIsYihxmE0kuTgyek5vqsIm5
-wBFnrRgBnxAlNl4JEI2v0GHy88figWgBLYXvIN4XNfcCWFV1aPqR4xHVe6vNqa8=
-=zdFV
+iQEcBAEBCAAGBQJSG/iLAAoJEFpvPKfnPDWzP0AH/A5CgH4nNt8OizhcI2/SgCP6
+YScquQrhi+tSZP0z88uRWj0aWcjCHr4NLUFTcrWSbeNiny+uO5cQJ94XnJZamFoA
+cRwmCikDEanYKo+HfZRvmTTqLPwbvKD3XgQPC6dcDkCSpfncf1LOzAtlvoeByuy8
+LA41glqNWSmyXEvzvoZ0cVT/CoIZ8tGdbQ0+bAVuOUBcysZI/lbwG1tBJibFSW20
+vCP4yAxtDiX9Yw3VDJzpfzp62VieCGHyKzP5FS+a1OSCkxEK8eOK+XD8f9dfIQSW
+/FHChZEeIL1pYBK/QwBBxqD+TIwnkLuuhUIZn3/ll/rccEo9xdxrcVZaq9kEp4g=
+=5SkR
 -----END PGP SIGNATURE-----
diff --git a/mail-client/geary/files/geary-0.4.0_pre1-cflags.patch b/mail-client/geary/files/geary-0.4.0_pre1-cflags.patch
new file mode 100644
index 000000000000..7a7666b2c4f8
--- /dev/null
+++ b/mail-client/geary/files/geary-0.4.0_pre1-cflags.patch
@@ -0,0 +1,27 @@
+commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:58 2013 +0200
+
+    respect system CFLAGS
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5202b99..949d494 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -471,16 +471,8 @@ set(CFLAGS
+     -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
+     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
+     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
+-    -g
+ )
+ 
+-if (NOT DEBUG)
+-    set(CFLAGS
+-        ${CFLAGS}
+-        -O2
+-    )    
+-endif ()
+-
+ if (REF_TRACKING)
+     message(STATUS "Reference tracking: ON")
+     set(EXTRA_VALA_OPTIONS
diff --git a/mail-client/geary/files/geary-0.4.0_pre1-unity.patch b/mail-client/geary/files/geary-0.4.0_pre1-unity.patch
new file mode 100644
index 000000000000..c2657dbe5889
--- /dev/null
+++ b/mail-client/geary/files/geary-0.4.0_pre1-unity.patch
@@ -0,0 +1,31 @@
+commit 1f875e8a629a54748eb46237fd854359aa5edbc8
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:45 2013 +0200
+
+    provide option for unity
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66145c9..5d4464c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,7 @@ option(DEBUG "Build for debugging." OFF)
+ option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
+ option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
+ option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON)
++option(WITH_UNITY "Add unity support." OFF)
+ 
+ if (DEBUG)
+     message(STATUS "Debug build")
+@@ -50,8 +51,10 @@ if (DESKTOP_VALIDATE)
+ endif ()
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
+-pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++if(WITH_UNITY)
++    pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
++    pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++endif()
+ 
+ # intl
+ include(Gettext)
diff --git a/mail-client/geary/geary-0.4.0_pre1.ebuild b/mail-client/geary/geary-0.4.0_pre1.ebuild
new file mode 100644
index 000000000000..6be324d70495
--- /dev/null
+++ b/mail-client/geary/geary-0.4.0_pre1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.4.0_pre1.ebuild,v 1.1 2013/08/27 00:53:24 hasufell Exp $
+
+# REMINDER: next release probably swaps gnome-keyring for libsecret-1
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.20
+
+inherit eutils fdo-mime gnome2-utils vala cmake-utils
+
+MY_P=${P/_pre/pr}
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="http://www.yorba.org/projects/geary/"
+SRC_URI="http://yorba.org/download/geary/${PV:0:3}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	>=app-crypt/libsecret-0.11
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libgee:0.8
+	dev-libs/libunique:3
+	dev-libs/libxml2:2
+	dev-libs/gmime:2.6
+	media-libs/libcanberra
+	net-libs/webkit-gtk:3[introspection]
+	>=x11-libs/gtk+-3.6.0:3[introspection]
+	x11-libs/libnotify"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	nls? ( virtual/libintl )"
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	$(vala_depend)
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{unity,cflags}.patch
+
+	local i
+	if use nls ; then
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in $(cd po ; echo *.po) ; do
+				if ! has ${i%.po} ${LINGUAS} ; then
+					sed -i -e "s/\s${i%.po}$//" po/CMakeLists.txt || die
+					rm po/${i} || die
+				fi
+			done
+		fi
+	else
+		sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDESKTOP_UPDATE=OFF
+		-DGSETTINGS_COMPILE=OFF
+		-DICON_UPDATE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DWITH_UNITY=OFF
+		-DDESKTOP_VALIDATE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	elog "For libnotify sounds you will need"
+	elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra"
+	elog "enabled."
+
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}