Fix install paths and desktop file (bug #237366), lock libopensync dependency

to 0.36 (bug #298109), add gdk-pixbuf include dir. EAPI 3. Remove old.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

6 files changed, 71 insertions, 40 deletions

diff --git a/app-pda/multisync-gui/ChangeLog b/app-pda/multisync-gui/ChangeLog
index 30dd34e5c38b..4b8afd7aa656 100644
--- a/app-pda/multisync-gui/ChangeLog
+++ b/app-pda/multisync-gui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/multisync-gui
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/ChangeLog,v 1.9 2008/05/31 14:12:49 loki_val Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/ChangeLog,v 1.10 2011/03/13 15:37:59 dirtyepic Exp $
+
+  13 Mar 2011; Ryan Hill <dirtyepic@gentoo.org> -multisync-gui-0.90.19.ebuild,
+  multisync-gui-0.92.0_pre20080531.ebuild,
+  +files/multisync-gui-0.92.0-cmake.patch,
+  +files/multisync-gui-0.92.0-pixbuf-include.patch, metadata.xml:
+  Fix install paths and desktop file (bug #237366), lock libopensync dependency
+  to 0.36 (bug #298109), add gdk-pixbuf include dir. EAPI 3. Remove old.
 
 *multisync-gui-0.92.0_pre20080531 (31 May 2008)
 
diff --git a/app-pda/multisync-gui/files/multisync-gui-0.92.0-cmake.patch b/app-pda/multisync-gui/files/multisync-gui-0.92.0-cmake.patch
new file mode 100644
index 000000000000..2edffd93e86e
--- /dev/null
+++ b/app-pda/multisync-gui/files/multisync-gui-0.92.0-cmake.patch
@@ -0,0 +1,41 @@
+Path-fixings.
+
+http://bugs.gentoo.org/237366
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ PROJECT( multisyncgui C )
+ 
+-SET( MULTISYNCGUI_GLADE_DIR "${CMAKE_INSTALL_PREFIX}/usr/share/multisync-gui/" )
+-SET( MULTISYNCGUI_ICON_DIR "${CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/multisync-gui/" )
++SET( MULTISYNCGUI_GLADE_DIR "${CMAKE_INSTALL_PREFIX}/share/multisync-gui/" )
++SET( MULTISYNCGUI_ICON_DIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps/" )
+ 
+ SET( MULTISYNCGUI_VERSION "0.36" )
+ SET( MULTISYNCGUI_GLADE "${MULTISYNCGUI_GLADE_DIR}/multisyncgui.glade" )
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -3,6 +3,6 @@ CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/multisyncgui.glade" "${CMAKE_CURREN
+ 
+ ###### INSTALL ################### 
+ 
+-INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/multisyncgui.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/usr/share/applications/" )
++INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/multisyncgui.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications/" )
+ INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/multisyncgui.glade" DESTINATION "${MULTISYNCGUI_GLADE_DIR}" )
+ INSTALL( FILES multisync.png DESTINATION ${MULTISYNCGUI_ICON_DIR} ) 
+--- a/misc/multisyncgui.desktop
++++ b/misc/multisyncgui.desktop
+@@ -3,10 +3,10 @@ Encoding=UTF-8
+ Name=multisyncgui
+ Comment=Synchronization program for personal information such as calendars, addressbooks etc.
+ Comment[de]=Synchronisation von Organizern, PIMs und Mobiltelefonen
+-Exec=@PREFIX@/bin/multisync-gui
++Exec=@CMAKE_INSTALL_PREFIX@/bin/multisyncgui
+ Terminal=false
+ Type=Application
+-Icon=@MULTISYNC_ICON_DIR@/multisync.png
++Icon=@MULTISYNCGUI_ICON_DIR@/multisync.png
+ StartupWMClass=multisync
+ X-Desktop-File-Install-Version=0.3
+ Categories=Application;Utility;X-Red-Hat-Base;
diff --git a/app-pda/multisync-gui/files/multisync-gui-0.92.0-pixbuf-include.patch b/app-pda/multisync-gui/files/multisync-gui-0.92.0-pixbuf-include.patch
new file mode 100644
index 000000000000..af88164a8e07
--- /dev/null
+++ b/app-pda/multisync-gui/files/multisync-gui-0.92.0-pixbuf-include.patch
@@ -0,0 +1,10 @@
+Add gdk-pixbuf include dir (split out in gtk+-2.21).
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS} ${LIBGLADE_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS} ${LIBGLADE_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} /usr/include/gdk-pixbuf-2.0 )
+ LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GTK2_LIBRARY_DIRS} ${LIBGLADE_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} )
+ 
+ SET( multisyncgui_SRCS
diff --git a/app-pda/multisync-gui/metadata.xml b/app-pda/multisync-gui/metadata.xml
index 0d934d06b5d0..f72acf2181ba 100644
--- a/app-pda/multisync-gui/metadata.xml
+++ b/app-pda/multisync-gui/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>pda</herd>
-	<maintainer>
-		<email>peper@gentoo.org</email>
-		<name>Piotr Jaroszyński</name>
-	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-
diff --git a/app-pda/multisync-gui/multisync-gui-0.90.19.ebuild b/app-pda/multisync-gui/multisync-gui-0.90.19.ebuild
deleted file mode 100644
index 973ef44d1c6c..000000000000
--- a/app-pda/multisync-gui/multisync-gui-0.90.19.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.90.19.ebuild,v 1.4 2008/01/05 17:24:46 peper Exp $
-
-DESCRIPTION="OpenSync multisync-gui"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="evo"
-
-DEPEND="<=app-pda/libopensync-0.35
-	evo? ( app-pda/libopensync-plugin-evolution2 )
-	>=gnome-base/libgnomeui-2.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc README AUTHORS
-}
diff --git a/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild b/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
index 8001a1d8d36c..b6d170bb38ef 100644
--- a/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
+++ b/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild,v 1.2 2008/05/31 14:14:58 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild,v 1.3 2011/03/13 15:37:59 dirtyepic Exp $
 
-inherit toolchain-funcs cmake-utils
+EAPI="3"
+
+inherit cmake-utils
 
 DESCRIPTION="OpenSync multisync-gui"
 HOMEPAGE="http://www.opensync.org/"
@@ -13,16 +15,14 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-RDEPEND=">=app-pda/libopensync-0.36
+RDEPEND="~app-pda/libopensync-0.36
 	>=dev-libs/libxml2-2.6.30
-	>=gnome-base/libglade-2.6.2
-	>=x11-libs/gtk+-2.6
-	dev-libs/atk"
+	>=gnome-base/libglade-2.6.2:2.0
+	>=x11-libs/gtk+-2.21:2"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.22"
 
-pkg_postinst() {
-	elog "${CATEGORY}/${PF} contains support for syncing with"
-	elog "the Evolution mail client. To take advantage of this, do:"
-	elog "# emerge mail-client/evolution"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.92.0-cmake.patch
+	epatch "${FILESDIR}"/${PN}-0.92.0-pixbuf-include.patch
 }