--- /usr/portage/dev-games/ogre/ogre-1.4.2.ebuild	2007-06-13 15:55:15.000000000 +0400
+++ ogre-1.4.2.ebuild	2007-06-22 21:46:36.000000000 +0400
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc cegui cg devil double-precision examples freeimage gtk openexr threads"
 RESTRICT="test" #139905
 
@@ -50,13 +50,6 @@
 	unpack ${A}
 	cd "${S}"
 	find -name CVS -print0 | xargs -0 rm -rf
-	if use examples ; then
-		cp -r Samples install-examples || die
-		find install-examples \
-			'(' -name 'Makefile*' -o -name obj -o \
-			    -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \
-			-print0 | xargs -0 rm -rf
-	fi
 	sed -i '/CPPUNIT/d' configure.in || die "sed failed"
 	epatch "${FILESDIR}"/${P}-cegui.patch
 	eautoreconf
@@ -65,7 +58,6 @@
 src_compile() {
 	econf \
 		--disable-dependency-tracking \
-		--disable-ogre-demos \
 		--enable-static \
 		--with-platform=GLX \
 		--with-gui=$(usev gtk || echo Xt) \
@@ -76,19 +68,32 @@
 		$(use_enable freeimage) \
 		$(use_enable openexr) \
 		$(use_enable threads threading) \
+		$(use_enable examples ogre-demos) \
 		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	einstall || die "einstall failed"
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/html
 		doins -r Docs/* || die "doins Docs failed"
 	fi
 	if use examples ; then
-		insinto /usr/share/doc/${PF}/Samples
-		doins -r install-examples/* || die "doins Samples failed"
+		into /usr/share/OGRE/Samples/
+		dobin Samples/Common/bin/*
+		insinto /usr/share/OGRE/Samples/
+		insinto /usr/share/OGRE/Samples/bin/
+		rm -f "${D}/usr/share/OGRE/Samples/bin"/*.in
+		rm -f "${D}/usr/share/OGRE/Samples/bin"/Makefile*
+		echo "" > Samples/Common/bin/ogre.cfg
+		sed -e 's,/usr/local,/usr,g' Samples/Common/bin/plugins.cfg >plugins.cfg.tmp
+		mv plugins.cfg.tmp Samples/Common/bin/plugins.cfg
+		insopts -m644
+		doins Samples/Common/bin/*.cfg
+		insopts -m666
+		doins Samples/Common/bin/ogre.cfg
+		cp -a Samples/Media "${D}/usr/share/OGRE/"
 	fi
 	dodoc AUTHORS BUGS LINUX.DEV README
 }