Add prefix support and keywords

Package-Manager: portage-2.2.0_alpha29_p11/cvs/Linux i686

3 files changed, 33 insertions, 12 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index e581e2d15fc5..562c7128ed92 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.130 2011/01/26 14:47:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.131 2011/04/14 18:28:15 abcd Exp $
+
+  14 Apr 2011; Jonathan Callen <abcd@gentoo.org> dia-0.97.1.ebuild:
+  Add prefix support and keywords
 
   26 Jan 2011; Pacho Ramos <pacho@gentoo.org> dia-0.97.1.ebuild:
   Let it compile when python3 is main interpreter. Bump to eapi3.
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 2ff228fbac58..516de5c2712c 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dia-0.97-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e39077b5f743ec0987 SHA1 054b6a43a4cb6dc7243dfa2fa7d6412687bf07e9 SHA256 a4c56ee5b05c01253936b7f9ed4d5b796e8f00a5148e94f7b9bba598595e484c
 AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6
 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
-EBUILD dia-0.97.1.ebuild 2718 RMD160 55eb73fb34f51b0de5867888337d53a784aed46f SHA1 7b3ba609e404a2a76531b08fcb4a905f2ce66541 SHA256 e89351116bf9066d61feb90c3c23307a004628e63a054642b6dac37bf51b68b0
-MISC ChangeLog 17172 RMD160 ca151bcecefe36565c3b04c1a71f958fb3d888e3 SHA1 69c37d7c59eb891fdf3b4987d8862758a73e0e30 SHA256 d8738582e2491a624583ade5f3c6ace59b9514c19e046d102f78302207ba4031
+EBUILD dia-0.97.1.ebuild 3099 RMD160 ee6bbb7f0dd0ee9079d3735c89926e226bf3ff8c SHA1 156adb734e6213c242f9f508761ac1fea2b2904f SHA256 a12614886ce2027f41117ed096127451851b840e40a0e96371eb286d51b9623b
+MISC ChangeLog 17274 RMD160 cd6a33293a0afeb2b70c096bab61e5acabbffb3a SHA1 095135b06481e6d745b7052fa2d1c60bdf2d2418 SHA256 aeefb06e42f5a32e52bf1ac66f917aeee387204e10b367d9912a6bde559521ef
 MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAk1ANB0ACgkQCaWpQKGI+9Tp5ACYjNNh+SzFq5ZbHBkGqwKPeGAy
-ugCfVnv4lnQHGElfzazYmkf2bicyJa8=
-=7l3S
+iQIcBAEBCAAGBQJNpzzJAAoJELHSF2kinlg4cnAP/2XpAcuxLJz0iaPW4jN0v7o5
+L7J7dWpN3C4N32jJGZEjJ7lOuYTbQcu94+f8ssE0aOgpapJPwX+nVt/KksErFqhu
+QZyK2LbFm/MtJHYkAnwe4zUYwNFYxSu9tZMczQnV9HrX2zDWpS/CJvDW5TI/WBw/
+iH6m2LRcg9UnjkHFIrkyIOTKPKQAwBVDBz3U/MGD5wNZ4NHXURrOCf0R1wh6KX1t
+B1naJlGKze6iVQv6dTWyUp81yPzVP6+m+H8oh3uy+8WFFKGTJ4PP5XusfqNTPhFo
+lTbdYxHW6KxES8TPKjhqpiAw3lzTCcnoWgmOYnZszU0Zzi9EUHy/O8fM8wOmM2SS
+mqaSo5i56+ml1q3hbEx9IAbNASZGbzk/puF1SeaxdLKa7cRFItrgIFLxVWoeijwq
+0iFJRgcsWxrYK4JNrbTbVvBb9EVdbGr4D0WBzi0DwW8g9e+WWtxsZffT6J2gZgHj
+INhrKnwyFRG5m8ckR3iK2kLwbTz9XJV3yppWmVXMj7vpnGE10lDEalOgZmpSpqAk
+gN/p7uP4Z4p5aPgjpVDU6PZoMqhuGbLOX6lCvBZ4Cz2Qv7/ibfrSCrd7//7I1siC
+lqigOkGnRwPOFh78tlgrC2O7yQPfd4fU9tO4sVApkaG9z6dJYBwfUrC5JXfgZTXr
+LoXnOO/xx5plcPU/U3az
+=VzpR
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
index 60d3bcccd575..50ca7230f07c 100644
--- a/app-office/dia/dia-0.97.1.ebuild
+++ b/app-office/dia/dia-0.97.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.11 2011/01/26 14:47:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.12 2011/04/14 18:28:15 abcd Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 PYTHON_DEPEND="python? 2"
 
-inherit eutils gnome2 libtool autotools versionator python
+inherit eutils gnome2 libtool autotools versionator python multilib
 
 MY_P=${P/_/-}
 DESCRIPTION="Diagram/flowchart creation program"
@@ -18,7 +18,7 @@ MY_PV_MM=$(get_version_component_range 1-2)
 SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
 IUSE="cairo doc gnome png python zlib"
 
@@ -58,7 +58,9 @@ pkg_setup() {
 		--without-swig
 		--without-hardbooks
 		--disable-static
-		--docdir=/usr/share/doc/${PF}"
+		--docdir=${EPREFIX}/usr/share/doc/${PF}
+		--exec-prefix=${EPREFIX}/usr"
+	# --exec-prefix makes Python look for modules in the Prefix
 	use python && python_set_active_version 2
 }
 
@@ -71,6 +73,8 @@ src_prepare() {
 	# Fix compilation with USE="python", bug #271855
 	if use python; then
 		epatch "${FILESDIR}/${PN}-0.97-acinclude-python-fixes.patch"
+		# use proper shared lib extension, #298232
+		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die
 	fi
 
 	# Skip man generation
@@ -79,6 +83,10 @@ src_prepare() {
 			|| die "sed 2 failed"
 	fi
 
+	# Fix naming conflict on Darwin/OSX
+	sed -i -e 's/isspecial/char_isspecial/' \
+		objects/GRAFCET/boolequation.c || die
+
 	# Don't use -DGTK_DISABLE_DEPRECATED, bug #333439
 	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' configure.in || die "sed 3 failed"