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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 53 insertions, 46 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/Manifest b/x11-misc/screengrab/Manifest
index 565bd7182189..78853e816d82 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST screengrab-0.9.85.tar.gz 110679 RMD160 d0dafd310b8adc9ab06704b3ac0dd769aeeb2a25 SHA1 62b2955fdb062dbe60dd33d9568c8cef1de5f2e2 SHA256 d7df9485e6b84b3ab0d5184b52f0c6719ddb23b3a43bde3ffd5696e97b62152d
 DIST screengrab-0.9.90.tar.gz 118179 RMD160 65b213e92f4afc5b165c8cdb6d8bf2797a00dd4f SHA1 9aca9b62a3c41266286cb551ab39db6a34d7282e SHA256 9a67c67cd5995c762c9ab25c395281ec890d94abe51671ace06786f75b72231a
 EBUILD screengrab-0.9.85.ebuild 945 RMD160 876773bf00129d5a796bc260bd51e404b6b2a595 SHA1 0b54c63819fd3b0f1c27e8b5265b2a3822fc4bdc SHA256 4ccfbc9fd85d311bc09a18ae15f8bd8765120ebdef033289221625f7ee25a76e
-EBUILD screengrab-0.9.90.ebuild 947 RMD160 69d35a69bf62f41fa0dced1ccfca1a680e313e7e SHA1 02fab7b4021e66507f3c85ce5059b560c5d82a5e SHA256 76f546f75d9eb27e87102e9d69a5dcadd7cb483da0c58d16e69f23cad65606cc
-MISC ChangeLog 3107 RMD160 b55ad9338ea66d4645f34384a2ebf8c394bf821f SHA1 f9c5d94c4571c4196c80d54b1f65db993ae51e1f SHA256 740e035fa0982169d6beeaacf0f1927c89809af3de49fd276959b91216c7debf
+EBUILD screengrab-0.9.90-r1.ebuild 816 RMD160 8f4737974db59b9b35f9f54e5a96032836efd60e SHA1 47ae4ee7f32a7e2b1e733f669119305f29ecb12a SHA256 c607a9cc973edda3d1ccc02b35797bfd3116e6622cdd6bda647eaa33e6b1c50e
+MISC ChangeLog 3364 RMD160 5626d0d4741104adee32333071fecdebf72ccee0 SHA1 5edae06499d38e3a0bc746a36b041d2e6b0dba67 SHA256 a4e2684bd866bd0b258dfcee7f49874c8d7508e0dfbe875e9f73862b53b9d0f8
 MISC metadata.xml 336 RMD160 d9f0653d77778bf76265c0ac98efd94b25ff535e SHA1 db9e4d3c40df57be6d1556daa26b9983384525bc SHA256 b0c364977edd6965d57ee0c5791b0959076fbaab372f7053db29f52b36e7ec0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPhYakAAoJEPqDWhW0r/LCwb4QALYEaDKc9PyEv7ue5g/5N+FX
-HQ5wWkGPenQDp5Xj8K2VQyso7UdGnj0tWxlSv2ylNxjpgE7inHjfRP/O679UXZOf
-zviq8jKmtw328mdyLJZERX+3/Qw01wzHSPxZBoCm/Q8hl+5sZFk/h32tdeA+rCDr
-Jzg4XIcTaoS0asp3Tryf6XhwL3K2u0qd1gX1JnlI3aMOMUFw+5VtiR+eIpbyb09u
-vf2H32RMngqrhafkcMZMHYfLOj7+SpUtPqYCRNM22X4reBVvwRUYfQaR3tWxYOyl
-xasZklxmFaAHJhhTzcUglJ9Zd3sL4302Jg3E7OF/LWnZdZ3OAv2fxyGoY77JifJD
-4iLle1qrSfsOyk/LP2zDX9IOPPidZ/64LPJrMcQPjk5EksydJfFZFMvI6OoLWosx
-Pp5vvqca3Q4s2u+2iqWlxu+lpmlk3/IrMMqP7Cm8VdIwxLWAU+9OD82xtUS2nCnI
-Z7DE0SjwPWyzFjR/2hXJuJIrsfgdaRL0N4HQ9lY4sutVZKLdyC8b1+AmwuP4mTly
-ftyUjwuSstCV+K9Pq+Ukn4NGwj35Os88nAd0XFo26RlYPkIw7a0cVUMgQqv6dI5a
-rgrG2D1OwIJDoudh1SapegjPQ/wmI01McoYHgg6d8oCT57aS4ftx7UOoYjXeJPKC
-g0GQmlROqAmbHKUGXUdU
-=z231
+iQIcBAEBCgAGBQJP4Q9IAAoJENXLsxwXqFxycHYP/jPlUyNtEfo4sLAyrF748Q1x
+/68JxWn2F1u3nublIWCfLSvsIm1fyLlE0SHGuNgiGIq+ehBKZ953NVAJHhnxtjbp
+gccUnsHOnE+fnW7qdUe4BZqvuG8pfCFZk0wAUJmwkQeTSgQBHZp7UDCwiZBjBJKg
+L5yMSvjhuBpoyuoWeNhBLWb3vLCtQHyCCjTtDvRuIXvprjM4jusZeG3PhjmAc0wI
+Uj9l3LopmsRUilXU2P0Z94KNmFiGtgg3KNHS0UokF7hiVniNLbd9WRj5UP6A23UV
+xYzZdi874NVKcZyMi7qWZeK+DZE+sSw3IYxy+m61bQ+DcvDEGkeNZNkcmGlJitmF
+CdBDOZbdHiUbSmeeh1auQdclEscxoO4c9HMtPkXpVIc6o51OvxCRCDb4pKDQ/KJH
+zehI/RoOLHIYiBbqmFomS8TA88njs3KtSPPMQ+Sqb16e5i17UeCp/MiBs96fy88T
+0LBF70lravYfRnIyJRQjZGKGsdb636IeZv3FD1rCMeaWsrIvMU1TCdPDxlJsIg+e
+EL4rjle9FeSZ4XBG0UYZCgp+llo2vzi3LJJ/n0FE6Ud4NqmaDh2kA8nUGbwJPhVg
+mMeTPUP366iQldUhemn0c4B8MaVUbW8OcVLEnhMNpiNLNys7TtlVb9ku+e/7PFcw
+a6XVYoT4BQOTEkSASNUO
+=WFU5
 -----END PGP SIGNATURE-----
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
-}