From 794e8e51f237ff86f88a70215e6f81e199ef1052 Mon Sep 17 00:00:00 2001
From: Marcin Deranek <gringo@slonko.net>
Date: Sun, 3 Feb 2019 12:32:52 +0100
Subject: Add desktop entry; cleanup

---
 media-gfx/scangearmp2/Manifest                  |  3 ++-
 media-gfx/scangearmp2/files/scangearmp2.desktop | 11 ++++++++
 media-gfx/scangearmp2/scangearmp2-9999.ebuild   | 36 +++++++++----------------
 3 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 media-gfx/scangearmp2/files/scangearmp2.desktop

(limited to 'media-gfx')

diff --git a/media-gfx/scangearmp2/Manifest b/media-gfx/scangearmp2/Manifest
index 5e20ed7..68e72aa 100644
--- a/media-gfx/scangearmp2/Manifest
+++ b/media-gfx/scangearmp2/Manifest
@@ -1 +1,2 @@
-EBUILD scangearmp2-9999.ebuild 2657 BLAKE2B 9382332dff3c7db3ca276a394503202a784599ee680f08e8d2f317b0fbac0a6f2aec2d8bb79df3ddb3b5ea31e5f20083e74b0513e5dff14ef6f38005d336a5f6 SHA512 fc2f6612f714dc61121d104a98d83703f12d9db5118d3e9726e0e5e0d3d11cc0806873a48f1063cd4efba4e3ca46347a8c8486e354df5328ce245f713e1301c6
+AUX scangearmp2.desktop 252 BLAKE2B 7e2fbf2de587390bcb23c5b5b9cd36f27fa78e6eb3dba3a0128ffe4e8d4e0d607824506d81b0f115e0d2096025d8639c261eb0f7f27388aa39d733700a1f7edb SHA512 71233acc250948f894fad789ce8286486f9dc8ce2c5aca31faf0533a84915076a2a77e769b16c1564dbbd45d79c67eb666aa5101c2844b4d14858e3594ac6e71
+EBUILD scangearmp2-9999.ebuild 2356 BLAKE2B c728c842d864e281339936729ffedfb764511a9995ab6c9a7c484bc34317c1355a0738dfa561b5500e10e9ce8f0be44ca85a2cd8d55d688549d067af03a377a4 SHA512 8ef9fc53714922c8f78c5c7521af10ee9d01ea038c7e8dc14554ae2a8f285322b1e00d5ba79628a35fea1518666200183aba62344f2656a1630710d7677ca591
diff --git a/media-gfx/scangearmp2/files/scangearmp2.desktop b/media-gfx/scangearmp2/files/scangearmp2.desktop
new file mode 100644
index 0000000..f2a18c8
--- /dev/null
+++ b/media-gfx/scangearmp2/files/scangearmp2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=ScanGear MP
+GenericName=ScanGear MP
+Comment=Cannon's scanner software
+Exec=scangearmp2
+TryExec=scangearmp2
+Icon=scanner
+Terminal=false
+Type=Application
+Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
+StartupNotify=true
diff --git a/media-gfx/scangearmp2/scangearmp2-9999.ebuild b/media-gfx/scangearmp2/scangearmp2-9999.ebuild
index 557e556..68afcee 100644
--- a/media-gfx/scangearmp2/scangearmp2-9999.ebuild
+++ b/media-gfx/scangearmp2/scangearmp2-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="7"
+EAPI=7
 
-inherit eutils flag-o-matic autotools multilib
+inherit eutils flag-o-matic autotools multilib desktop
 
 DESCRIPTION="Canon InkJet Scanner Driver and ScanGear MP for Linux (Pixus/Pixma-Series)."
 HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100303302.html"
@@ -27,17 +27,6 @@ IUSE="+sane usb"
 DEPEND=">=dev-libs/libusb-1.0.0
 	>=x11-libs/gtk+-2.16.0"
 
-pkg_setup() {
-	if [ -z "$LINGUAS" ]; then    # -z tests to see if the argument is empty
-		ewarn "You didn't specify 'LINGUAS' in your make.conf. Assuming" 
-		ewarn "English localisation, i.e. 'LINGUAS=\"en\"'." 
-		LINGUAS="en" 
-	fi
-
-	_libdir="/usr/$(get_libdir)"
-	_udevdir="/lib/udev/rules.d"
-}
-
 src_prepare() {
 	cd ${PN}
 	eapply_user
@@ -45,7 +34,7 @@ src_prepare() {
 }
 
 src_configure() {
-	cd scangearmp2
+	cd ${PN}
 
 	if use x86; then
 		LDFLAGS="-L$(pwd)/../com/libs_bin32"
@@ -58,15 +47,19 @@ src_configure() {
 }
 
 src_compile() {
-	cd ${PN}
-	make
+	pushd ${PN}
+	make || die "Couldn't build ${PN}"
+	popd
 }
 
 src_install() {
-	cd ${PN}
-	make DESTDIR=${D} install || die "Couldn't make install scangearmp2"
+	pushd ${PN}
+	make DESTDIR=${D} install || die "Couldn't make install ${PN}"
+	popd
+	domenu "${FILESDIR}"/${PN}.desktop
 
-	cd ..
+	_libdir="/usr/$(get_libdir)"
+	_udevdir="/lib/udev/rules.d"
 
 	dodir ${_libdir}
 	if use x86; then
@@ -101,9 +94,4 @@ pkg_postinst() {
 			einfo "Please, reload usb rules manually."
 		fi
 	fi
-
-	einfo ""
-	einfo "If you experience any problems, please visit:"
-	einfo " http://forums.gentoo.org/viewtopic-p-3217721.html"
-	einfo ""
 }
-- 
cgit v1.2.3