[gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     61195378cdec44a3ee380ef02dd7526333b1e329
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 08:50:02 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 08:50:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=61195378

[kde-base/marble] Fix automagic dependency on shapelib, wrt bug #430804.

(Portage version: 2.1.11.13/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/files/marble-4.9.1-shapelib.patch |   13 +++++++++++++
 kde-base/marble/marble-4.9.1.ebuild               |    6 +++++-
 kde-base/marble/marble-4.9.49.9999.ebuild         |    4 +++-
 kde-base/marble/marble-9999.ebuild                |    4 +++-
 kde-base/marble/metadata.xml                      |    1 +
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/kde-base/marble/files/marble-4.9.1-shapelib.patch b/kde-base/marble/files/marble-4.9.1-shapelib.patch
new file mode 100644
index 0000000..2f86c73
--- /dev/null
+++ b/kde-base/marble/files/marble-4.9.1-shapelib.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/runner/CMakeLists.txt b/src/plugins/runner/CMakeLists.txt
+index 4ab295a..0b82fa7 100644
+--- a/src/plugins/runner/CMakeLists.txt
++++ b/src/plugins/runner/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_subdirectory( osm )
+ add_subdirectory( pnt )
+ add_subdirectory( log )
+ 
+-find_package( libshp )
++macro_optional_find_package( libshp )
+ if( LIBSHP_FOUND )
+   add_subdirectory( shp )
+ endif( LIBSHP_FOUND )

diff --git a/kde-base/marble/marble-4.9.1.ebuild b/kde-base/marble/marble-4.9.1.ebuild
index 6527574..af65f88 100644
--- a/kde-base/marble/marble-4.9.1.ebuild
+++ b/kde-base/marble/marble-4.9.1.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/PyQt4-4.4.4-r1
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
+	shapefile? ( sci-libs/shapelib )
 "
 DEPEND="
 	${RDEPEND}
@@ -43,6 +44,8 @@ REQUIRED_USE="
 	python? ( kde )
 "
 
+PATCHES=( "${FILESDIR}/${P}-shapelib.patch" )
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
@@ -64,6 +67,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)

diff --git a/kde-base/marble/marble-4.9.49.9999.ebuild b/kde-base/marble/marble-4.9.49.9999.ebuild
index fba8593..ef14a3c 100644
--- a/kde-base/marble/marble-4.9.49.9999.ebuild
+++ b/kde-base/marble/marble-4.9.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/PyQt4-4.4.4-r1
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
+	shapefile? ( sci-libs/shapelib )
 "
 DEPEND="
 	${RDEPEND}
@@ -64,6 +65,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index fba8593..ef14a3c 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -30,6 +30,7 @@ RDEPEND="
 		>=dev-python/PyQt4-4.4.4-r1
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
+	shapefile? ( sci-libs/shapelib )
 "
 DEPEND="
 	${RDEPEND}
@@ -64,6 +65,7 @@ src_configure() {
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		$(use kde && cmake-utils_use_with python PyKDE4)

diff --git a/kde-base/marble/metadata.xml b/kde-base/marble/metadata.xml
index 5c6e78a..90fe1d9 100644
--- a/kde-base/marble/metadata.xml
+++ b/kde-base/marble/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <use>
 	<flag name="designer-plugin">Enable designer plugin</flag>
+	<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>