media-libs/amanith: Added CXX= since it didn't respect CXX

Cosmetic cleanups
Not setting +x on the examples anymore, the user should do it if needed

svn path=/sunrise/; revision=969

3 files changed, 25 insertions, 35 deletions

diff --git a/media-libs/amanith/ChangeLog b/media-libs/amanith/ChangeLog
index e1499e6aa..7aca6b70d 100644
--- a/media-libs/amanith/ChangeLog
+++ b/media-libs/amanith/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Aug 2006; Tiziano Müller <gentoo@dev-zero.ch> amanith-0.3.ebuild:
+  Added CXX= since it didn't respect CXX
+  Cosmetic cleanups
+  Not setting +x on the examples anymore, the user should do it if needed
+
   13 Aug 2006; Tiziano Müller <gentoo@dev-zero.ch> amanith-0.3.ebuild:
   Adding ~amd64 KEYWORD, thanks to M.Schouten for testing
 
diff --git a/media-libs/amanith/Manifest b/media-libs/amanith/Manifest
index dccc851b6..d36307d74 100644
--- a/media-libs/amanith/Manifest
+++ b/media-libs/amanith/Manifest
@@ -7,14 +7,14 @@ MD5 78134ad410ea1324ffbb474b43d898b9 files/0.3-plugins_dep.patch 2437
 RMD160 190b0a1f623374d83cf1bd6ad038d90a8e411131 files/0.3-plugins_dep.patch 2437
 SHA256 610ff4933579822b1d1f3df90e5fc06a5797eb23d0ac99c45b45395c28f7b854 files/0.3-plugins_dep.patch 2437
 DIST amanith_03.tar.gz 7688202 RMD160 6bfe1f54bbf3ff70b299c5ebf9d2d13cfcfaa6fd SHA1 7bc3ab197a227d3dabf1902e420cba36e0a4e903 SHA256 2e92dde6e56abef0f5146fd61ad0310e176d25578673353afe4def99c6bdaa1a
-EBUILD amanith-0.3.ebuild 1927 RMD160 9aba181720ff5e455e4771f01964973a8150d991 SHA1 4a6710b0c761bce5feda21e57063c8bcbf66b4b3 SHA256 d72dd4fea291231fd2710349a156f771a1abb3e24ad5d5ca5a223f69662d09a5
-MD5 53c406605c5dbe9dc050cb24b68b3192 amanith-0.3.ebuild 1927
-RMD160 9aba181720ff5e455e4771f01964973a8150d991 amanith-0.3.ebuild 1927
-SHA256 d72dd4fea291231fd2710349a156f771a1abb3e24ad5d5ca5a223f69662d09a5 amanith-0.3.ebuild 1927
-MISC ChangeLog 467 RMD160 e7a1f950a3470566f3417a734aaa2888e5db9859 SHA1 47b72064ddc7d4a03983a59428787329b9fa8505 SHA256 3bfb80f50f39a3bbb5906be29664279af87f8088443c5fbe9541a9291c82750e
-MD5 535b73b9f2497112913194b6f9e8e3e2 ChangeLog 467
-RMD160 e7a1f950a3470566f3417a734aaa2888e5db9859 ChangeLog 467
-SHA256 3bfb80f50f39a3bbb5906be29664279af87f8088443c5fbe9541a9291c82750e ChangeLog 467
+EBUILD amanith-0.3.ebuild 1633 RMD160 523d6d18c337d95dda6a66b5e89347331b0f93a2 SHA1 054b91f8b3fdc53c2a5260ab97356ebae765aeb1 SHA256 56e2493b729a7c72d6acb59e4b98ee18d42cd5254b3e42e8a4c49cf9812bceb4
+MD5 4e07c0687c22018a568af5ab79c622fb amanith-0.3.ebuild 1633
+RMD160 523d6d18c337d95dda6a66b5e89347331b0f93a2 amanith-0.3.ebuild 1633
+SHA256 56e2493b729a7c72d6acb59e4b98ee18d42cd5254b3e42e8a4c49cf9812bceb4 amanith-0.3.ebuild 1633
+MISC ChangeLog 675 RMD160 e9ef731a1c29b948e8ecc3db977380a84173c9b2 SHA1 dbf88485a354e768c3af36d2bacbc63af6656253 SHA256 1b58d4cc3ea34a910921905ae07ffab15d139f57da205d9d8bbabc13ba043a1f
+MD5 910fc0459e3948e1be12d38c6ca95354 ChangeLog 675
+RMD160 e9ef731a1c29b948e8ecc3db977380a84173c9b2 ChangeLog 675
+SHA256 1b58d4cc3ea34a910921905ae07ffab15d139f57da205d9d8bbabc13ba043a1f ChangeLog 675
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/media-libs/amanith/amanith-0.3.ebuild b/media-libs/amanith/amanith-0.3.ebuild
index cb4e45382..614346852 100644
--- a/media-libs/amanith/amanith-0.3.ebuild
+++ b/media-libs/amanith/amanith-0.3.ebuild
@@ -2,27 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit eutils toolchain-funcs
+
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="Crossplatform & Opensource C++ Vector Graphic Framework"
 HOMEPAGE="http://www.amanith.org/blog/index.php"
 SRC_URI="http://www.amanith.org/download/files/${PN}_${PV/./}.tar.gz"
-
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="examples qt4"
 
-
 DEPEND=">=media-libs/freetype-2.1.10
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.10
-	>=sys-libs/zlib-1.2.3
-	qt4? ( >=x11-libs/qt-4.1.0 )
-	!qt4? ( =x11-libs/qt-3* )"
+		>=media-libs/jpeg-6b
+		>=media-libs/libpng-1.2.10
+		>=sys-libs/zlib-1.2.3
+		qt4? ( >=x11-libs/qt-4.1.0 )
+		!qt4? ( =x11-libs/qt-3* )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
@@ -45,14 +44,13 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"
 	export AMANITHDIR="${S}"
 	if ! use qt4; then
 		export QTDIR="/usr/qt/3"
 		PATH="${QTDIR}/bin:${PATH}"
 	fi
 	qmake || die "qmake failed"
-	emake || die "emake failed"
+	emake CXX=$(tc-getCXX) || die "emake failed"
 }
 
 src_install() {
@@ -67,23 +65,10 @@ src_install() {
 	doins "doc/amanith.chm"
 
 	if use examples; then
-		insinto "/usr/share/${PN}"
-
 		# remove the object files
 		find ./examples -iname "*.o" -delete
 
-		doins -r examples
-		# and set the executable bit for the demos (removed by doins),
-		# note: do not use 'cp -r' since every file has executable bit set
-		for file in $(find "${D}/usr/share/${PN}/examples" -print); do
-			if [[ -n $(readelf -s "${file}" 2>/dev/null) ]]; then
-				chmod a+x ${file};
-			fi
-		done
-
-
-		doins -r data
-		doins -r config
+		insinto "/usr/share/${PN}"
+		doins -r examples data config
 	fi
-
 }