projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5052377)
Modernize ebuild; drop old, respect CC and CFLAGS, bug #428598
authorJustin Lecher <jlec@gentoo.org>
Fri, 20 Mar 2015 16:05:48 +0000 (16:05 +0000)
committerJustin Lecher <jlec@gentoo.org>
Fri, 20 Mar 2015 16:05:48 +0000 (16:05 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

x11-plugins/gkrellweather/ChangeLog patch | blob | history
x11-plugins/gkrellweather/Manifest patch | blob | history
x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild [deleted file] patch | blob | history
x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild [deleted file] patch | blob | history
x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild patch | blob | history
x11-plugins/gkrellweather/metadata.xml patch | blob | history

diff --git a/x11-plugins/gkrellweather/ChangeLog b/x11-plugins/gkrellweather/ChangeLog
index e2edfa5369b6073c5842dad764e49a8a7f3dcd80..fa6bf12398a8dd6a4147687b504cb69ab0735d86 100644 (file)
--- a/x11-plugins/gkrellweather/ChangeLog
+++ b/x11-plugins/gkrellweather/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellweather
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.34 2013/06/01 11:38:58 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.35 2015/03/20 16:05:47 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -gkrellweather-2.0.7-r1.ebuild,
+  -gkrellweather-2.0.7-r2.ebuild, gkrellweather-2.0.8.ebuild, metadata.xml:
+  Modernize ebuild; drop old, respect CC and CFLAGS, bug #428598
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #144305
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index 37c54e8fe08cd30f23b1de76e9df7cd7b094528d..af4fc29fb722d4d0030d94bde22ab26dab2ba54b 100644 (file)
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,22 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gkrellweather-2.0.7-Move-GrabWeather.patch 2081 SHA256 516777c80518a0c2aa924daf7028222a24a7f30714892741bf5551ab29ab032c SHA512 e6b8b3755e737f7b5d948971f2f0f2b1e0bf2d0a5a023a62ac4248e675c74e326dbf6ec4cc6fcecca7739f522f2e35774bf3a9e5cc42a0cad3496e8bb5938c9d WHIRLPOOL ca30e6d5eaa2830f039c11b873814fbc32c73280c812c919fc9d2576eba0492f8896615975152c0974be7b6d008c832468de1b4dfa3a9f9421fde68eab3ba6eb
 AUX gkrellweather-2.0.7-Respect-LDFLAGS.patch 537 SHA256 66aa262d2154db592da67205834e04a1217ada213c06e9083eb931db017e1be6 SHA512 0735a7ebdb322ea55ffb0204c2cf52d15638687f462dc5303f070d5ca8cd9218e083db1ff6f9d6eb2be345dd02580822612eaf1df0158b2e3683add34042eb2b WHIRLPOOL 0bd6c4e17b54fbf345bc8baefa8f490119a462b6b352abe4d43338262fcea9925b569140d64121fdf145926b3bc5e962ff8dfc08edf8fa83d9e05858742d90ef
 AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 SHA256 4209c50950352c8f4cba5a5bf3998f03722a7fe5cf01bf177faa0fbba46e04e4 SHA512 9c078e68f28c829f19e4e8e2836795508f5b124aa2a7b8535857266d16b9ba6404604e1527751dee99e632237be106eed456bebc2b14f69799a46888ab9699ff WHIRLPOOL 6bc245d58e04fc38bfff54a8c5eb1812a2ca5f914d36569f2018109402096ada8031c072a51380f9000d2307d53d60b4c95f440140182492c69e428be600b64b
 AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 537 SHA256 66aa262d2154db592da67205834e04a1217ada213c06e9083eb931db017e1be6 SHA512 0735a7ebdb322ea55ffb0204c2cf52d15638687f462dc5303f070d5ca8cd9218e083db1ff6f9d6eb2be345dd02580822612eaf1df0158b2e3683add34042eb2b WHIRLPOOL 0bd6c4e17b54fbf345bc8baefa8f490119a462b6b352abe4d43338262fcea9925b569140d64121fdf145926b3bc5e962ff8dfc08edf8fa83d9e05858742d90ef
 DIST gkrellweather-2.0.7.tgz 19968 SHA256 ad902acd0ffb8adb1f0d838e57545d1f52a31ae33711b73d28929c2786a740ca
-DIST gkrellweather-2.0.8.tgz 20227 SHA256 06236ad489151019e71bab4ba63b4b8b06d58c58890caed8b1a28fdd05cde16d
-EBUILD gkrellweather-2.0.7-r1.ebuild 944 SHA256 9e1b2368edc1b43f9f744279b0469f548b6a82b8076b01e0956d48c0ee468d31 SHA512 0142868586d25e20602994fffc8e3d82aa59341e9c6648bc6c1f3d47945f7e92250347b43bbcd47fcb792aaf7e4a2f3253ed39484f680d912b6a983ab8384f36 WHIRLPOOL 2324fb8974a721b6a1af80aba264b5bebb2a2c7a147338c550370578e9fe625308fd3460a1bc05c5b2649107f1b7d88541a237bd6a5fa98bbdd3a62da16d86e7
-EBUILD gkrellweather-2.0.7-r2.ebuild 915 SHA256 d11948c102b91d6fac87217bd9c4ae1fa452d2ef45242fc07a84daef237f59c2 SHA512 82d50e978faec9d2e133955b279b3c5a86449a93cd994cf4e5d002007d49b5020630404347d8507c260ae12a1fd0c09c21dac5dace84cc2a3b077eb911190db4 WHIRLPOOL 4548f30e10baa8463f99c3bbcf89fd084523a39acdca7cbf7c08f28b53afa4d88d1f1d7afa1725178e4e7a70a125caa495334099568e583ffad3a428941dcd7c
+DIST gkrellweather-2.0.8.tgz 20227 SHA256 06236ad489151019e71bab4ba63b4b8b06d58c58890caed8b1a28fdd05cde16d SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264 WHIRLPOOL 0f37fc40c0c73d9eb1661129f36cfbef64cd14d4b4d5fe01aec5a28087f30407cb1055ab439e951d76841bf6b1fde12f234f7c6c05b0658a5c3ae499254515bb
 EBUILD gkrellweather-2.0.7.ebuild 963 SHA256 f2c9621638809c972d61316c49864704304223d781febee28ce9bd4f411a8496 SHA512 41e3cf355592369e455e361628a131640ee27eefde7316bf8b41d59239c05acaf01f48a52a145ad465ad56ad5256d1143d45d43a0fee5c5e6e58e41f1206e35b WHIRLPOOL eb7fc22ec463858e61230b79e00d975f03a8baf7f119558248de661c3e4b8b3fa0dff5d9714de0e708db5b7a6b2e363c9e444a84f86b55fe31ff133ca0c3e2c0
-EBUILD gkrellweather-2.0.8.ebuild 910 SHA256 86bbf5104624cc94ffba212d8bbbae34627bddf225f475da0624ba33d9edc8ea SHA512 0b572bd8ffc31f9742b536641a8fcbc688d74ea37ed908cfdc0f72db1d2a0fba2a518872aea0fffc041c2f5ddacb14a03e7cf4535e58d638cde18e8123379ca4 WHIRLPOOL a4d9cb0e2d314c78ce26101c6920a067685615219eb700f67b340a3b88b58d94da52660140d62c73d2dd4bad572108091193f034e67560b5970f0f3cf41c3e0c
-MISC ChangeLog 5510 SHA256 0920673688e121561d5034b688911213d2c3e4cdd12e0baa9597292c3d3692d9 SHA512 46cf0b2a1214e08734a31dfa957bbcc42d50dfe89105d13937491f1ab42fb585e6abb28bac525949f86754e5144b175c9a3a3b737536f5855d713780b2377f20 WHIRLPOOL b4cd7177ec5db65d5566f43c024e0bb33daf0ef5da73ab43962b78208d477d282d5d6f746f1500d548df0d83379f37dc6cb89f31c7e244c9b6ba86c5844bfbe7
-MISC metadata.xml 166 SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941 SHA512 85f57124de5c89f57dfd2f9c969701908554ebd07f50a084835ae35d91395fe79c6fa002c040546854009e700e7c65e9345fdb3a616978fab14c08939721f616 WHIRLPOOL 203631ae3c7368dbd852a4ae2d6826d6bbc02a3417f816c84c8b16220aafff00a62e5b3bb46d231e4702fbce62b4a172c8db1aac275b6c8975dc669dfc9bd7a9
+EBUILD gkrellweather-2.0.8.ebuild 973 SHA256 2d73921496585749e7dc5ce041f33f4d291bc62e3a9293633352f7e86a0a2d0a SHA512 81da8596a7f6e4363d6593a69e916b5c70466a58107a26fa1ce2be34f3cdcf70d1693ae21147c2d38d30aa904ce6f06bfbaf004c1bfee041cee062a5e06a74c1 WHIRLPOOL 8b75a6f2382a52cab017aa40e47f3f4995258c5fdbc82a5478e477c04cfd414b721d143505bdef30c90c531b7e39b4a24d72baea6e70e0fcdfd12a52260c2c1a
+MISC ChangeLog 5730 SHA256 264435a8b64bbd9406da711ff90fb5539fb177b72dd6814302feddff288d3082 SHA512 0d92fb3c6d5b310bc84adfe96b1ce1beb281fe396324e3a11e626f83458cebf50945e88e9b5b13af1971a0f38c0b54e5df42282007b623ec9b75207189cba58b WHIRLPOOL b7f85c5d825626f3054b7eebd89b40c03bb172750a00511721650e3ba1a3c0bde11e549aa4d1acd4a46d8fb7cb7d255931dc8e018cd0ab5ed9c6aeb250993118
+MISC metadata.xml 167 SHA256 0b161d83e9e7cad5a69cc5c2a23a5ba0fcac0d20751516b605dc232d9a2e7284 SHA512 cde6cff04d85c5663f874c4dde361195437c9f2262e7ef300a001b55151425b264d7439640d7d19c96d855d5cdb780c75ab5261b6028e8316cfabf66beaf65d4 WHIRLPOOL 7622a694f6d3fc1bc2f7fccd6a07ebb1e2f3dd00fecff580ebb272c86916c9a3953b5db0566097fbd993318bfecde00190baaf51b96b4ab8bdb96d3ca3d0c73b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlGp3VMACgkQCaWpQKGI+9QdmQCdFlO4clV6m2hMS3/f1GV/xe8q
-7ZIAn1jSCpiQctUJvgxunM3Naziy+ABk
-=qoXO
+iQJ8BAEBCgBmBQJVDEVcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirsNkP/iHluze+qV9TXdP9ydMiqWme
+9sRgRWidUPL+QmsYI8b12mxmnuxLG9QdaeYO77vL07Lb0LMBY2KPllH7CybELCIW
+f3Q+LZfGU0SLqJ7l2mT+5aAiLlu6MhWswlMbyJUoIPaxqUryJLiXp1LVTj5sBMWD
+1dntKMEGu7ThwwAk5IEMoehAXaUgyDHaseWKtDwAyEShyZQFNt4X6WU+LalTddv/
+BRl2NjHdt0Vd4p+FHWNn0DJIZMwWO+TqJ53WMKd1Y/7N/qbFmVTP4EJfZWAYOlWv
+XredWq6ADiXfpbLQ4Obcmd7mltjXD4iPVioSQ6p4MosYZQCKcKCMRUQS+O21ojkx
+0cNXyxwrIzQ//V5Pr+W8TJYOUHPEkAsyfLOj/0NUYUFG+j7xCCfhsSx/Gd7vPJTn
+ihlJNMi8I9ucGA2PUmySbWi2bqeJOQVMeX75eh4tdDXBVqJIwjRXwn5FCcEksWpI
+Ri5HJ9CWe5je2FY438XfPMb2azP1aNS8LbYjMN3HX7wKdvLjjtQDJ0qAsKjHMP6D
+mjPFw4FwrO6NCz1OWFAGdHwnhtuw7MVNZo3EmpkAla7MNfPkD4fyEEAUcv3JVk0r
+I2WC6CwhXHUj5DA4vMlY4XXt+iXgFPW5J4VJBdrhOiI/Zte9uzB/sBMnefTbmw9W
+f6zKlrXUe2fI9crDvBMe
+=ujx9
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild
deleted file mode 100644 (file)
index 47264c9..0000000
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild,v 1.2 2010/08/25 00:44:14 lack Exp $
-
-EAPI=3
-inherit gkrellm-plugin
-
-IUSE=""
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
-info"
-SRC_URI="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/${P}.tgz"
-HOMEPAGE="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-       >=net-misc/wget-1.5.3
-       !x11-misc/bbweather"
-DEPEND=">=sys-apps/sed-4.0.5"
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-       sed -i \
-               -e "s:/usr/share/gkrellm:/usr/bin:g" \
-               gkrellweather.c || die
-}
-
-src_compile() {
-       emake PREFIX=/usr || die
-}
-
-src_install () {
-       gkrellm-plugin_src_install
-
-       exeinto /usr/bin
-       doexe GrabWeather
-}
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild
deleted file mode 100644 (file)
index f63333f..0000000
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild,v 1.1 2010/08/25 00:44:14 lack Exp $
-
-EAPI=3
-inherit gkrellm-plugin
-
-IUSE=""
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
-info"
-SRC_URI="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/${P}.tgz"
-HOMEPAGE="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-       >=net-misc/wget-1.5.3"
-DEPEND=">=sys-apps/sed-4.0.5"
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-       epatch "${FILESDIR}/${P}-Move-GrabWeather.patch"
-}
-
-src_compile() {
-       emake PREFIX=/usr || die
-}
-
-src_install () {
-       gkrellm-plugin_src_install
-
-       exeinto /usr/libexec/gkrellweather
-       doexe GrabWeather
-}
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
index 31b8fe7f55930cb80f4fe67502a529a9f6366799..9a700e5001704f9f289e5efb1647e9b59e2be529 100644 (file)
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild,v 1.1 2011/05/10 18:20:14 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild,v 1.2 2015/03/20 16:05:47 jlec Exp $
 
-EAPI=3
-inherit gkrellm-plugin
+EAPI=5
 
-IUSE=""
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
-info"
-SRC_URI="http://sites.google.com/site/makovick/projects/${P}.tgz"
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
 HOMEPAGE="http://sites.google.com/site/makovick/gkrellm-plugins"
+SRC_URI="http://sites.google.com/site/makovick/projects/${P}.tgz"
 
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.6.1
+RDEPEND="
+       >=dev-lang/perl-5.6.1
        >=net-misc/wget-1.5.3"
 DEPEND=">=sys-apps/sed-4.0.5"
-
+pkg_setup() { :; }
 src_prepare() {
-       epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-       epatch "${FILESDIR}/${P}-Move-GrabWeather.patch"
+       epatch \
+               "${FILESDIR}"/${P}-Respect-LDFLAGS.patch \
+               "${FILESDIR}"/${P}-Move-GrabWeather.patch
 }
 
 src_compile() {
-       emake PREFIX=/usr || die
+       emake PREFIX=/usr CC=$(tc-getCC) CFLAGS="${CFLAGS}"
 }
 
 src_install () {
diff --git a/x11-plugins/gkrellweather/metadata.xml b/x11-plugins/gkrellweather/metadata.xml
index a03f5d8b381be344344795266c7d946560a231c7..ca551894a934a784adffdbbded90d8490ff63e6f 100644 (file)
--- a/x11-plugins/gkrellweather/metadata.xml
+++ b/x11-plugins/gkrellweather/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>desktop-dock</herd>
+  <herd>desktop-dock</herd>
 </pkgmetadata>
Unnamed repository; edit this file 'description' to name the repository.