EAPI=4, fix sed expression to really install docs into the right dir (bug 421915), add missing dep on libX11.

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

3 files changed, 38 insertions, 31 deletions

diff --git a/x11-misc/screengrab/ChangeLog b/x11-misc/screengrab/ChangeLog
index 73cf072c25ce..f787d3d5a672 100644
--- a/x11-misc/screengrab/ChangeLog
+++ b/x11-misc/screengrab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/screengrab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/screengrab/ChangeLog,v 1.21 2012/04/11 13:26:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/screengrab/ChangeLog,v 1.22 2012/06/19 23:46:10 pesa Exp $
+
+*screengrab-0.9.90-r1 (19 Jun 2012)
+
+  19 Jun 2012; Davide Pesavento <pesa@gentoo.org> +screengrab-0.9.90-r1.ebuild,
+  -screengrab-0.9.90.ebuild:
+  EAPI=4, fix sed expression to really install docs into the right dir (bug
+  421915), add missing dep on libX11.
 
 *screengrab-0.9.90 (11 Apr 2012)
 
diff --git a/x11-misc/screengrab/screengrab-0.9.90-r1.ebuild b/x11-misc/screengrab/screengrab-0.9.90-r1.ebuild
new file mode 100644
index 000000000000..4491e07688fe
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-0.9.90-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/screengrab/screengrab-0.9.90-r1.ebuild,v 1.1 2012/06/19 23:46:10 pesa Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="Qt application for getting screenshots"
+HOMEPAGE="http://code.google.com/p/screengrab-qt/"
+SRC_URI="http://screengrab-qt.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Install docs into the right dir, but skip the license.
+	# Respect CXXFLAGS.
+	sed -i -e "/LICENSE.txt/d" \
+		-e "/SG_DOCDIR/s:share/doc/screengrab:${PF}:" \
+		-e "/CMAKE_CXX_FLAGS/s:\"): ${CXXFLAGS}&:" \
+		CMakeLists.txt || die
+}
diff --git a/x11-misc/screengrab/screengrab-0.9.90.ebuild b/x11-misc/screengrab/screengrab-0.9.90.ebuild
deleted file mode 100644
index de838b42ab80..000000000000
--- a/x11-misc/screengrab/screengrab-0.9.90.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/screengrab/screengrab-0.9.90.ebuild,v 1.1 2012/04/11 13:26:55 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="Qt tool for geting screenshots"
-HOMEPAGE="http://code.google.com/p/screengrab-qt/"
-SRC_URI="http://screengrab-qt.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# do not install license
-	sed -i "/LICENSE.txt/d" CMakeLists.txt \
-		|| die "failed to patch cmakelists"
-	# install docs in the right dir
-	sed -i -e "s#DESTINATION share/doc/screengrab#DESTINATION share/doc/${PF}#" \
-		-e "s:-Wnon-virtual-dtor -Woverloaded-virtual:${CXXFLAGS}:" \
-		CMakeLists.txt || die "failed to patch doc dir"
-	sed -i "s:screengrab%1html:${PF}%1html:" src/ui/mainwindow.cpp || die
-}