From: Markus Ullmann Date: Thu, 1 Feb 2007 14:48:52 +0000 (+0000) Subject: Version bump (again), thanks to Frederic Mangeant in bug #164798 for reporting X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49a2a5f1ff1fd38ad38fa944308987d990b921ad;p=gentoo.git Version bump (again), thanks to Frederic Mangeant in bug #164798 for reporting Package-Manager: portage-2.1.2-r1 --- diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index ab4f21bf3080..5002f79f09f3 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-analyzer/rrdtool # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.117 2007/01/31 20:52:45 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.118 2007/02/01 14:48:52 jokey Exp $ + + 01 Feb 2007; Markus Ullmann + +files/rrdtool-1.2.19-as-needed.patch, + +files/rrdtool-1.2.19-as-needed.patch-new, + +files/rrdtool-1.2.19-tclbindings.patch, -rrdtool-1.0.50.ebuild, + -rrdtool-1.2.15-r2.ebuild, -rrdtool-1.2.18.ebuild, +rrdtool-1.2.19.ebuild: + Version bump (again), thanks to Frederic Mangeant in bug #164798 for reporting + +*rrdtool-1.2.19 (01 Feb 2007) + + 01 Feb 2007; Markus Ullmann +rrdtool-1.2.19.ebuild: + Version bump (again), thanks to Frederic Mangeant in bug #164798 for reporting 31 Jan 2007; Tobias Scherbaum rrdtool-1.2.15-r3.ebuild: diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 2020109f1806..fcbc6503f727 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX rrdtool-1.2.15-mem-usage.patch 4039 RMD160 674ac6fd1ec441776d3b364c919411a991baf162 SHA1 8b8f330627021b6de61dd77ee62e4a9e291b2b19 SHA256 a3363e8ac158eaa4179489735f2cfb2b1a7d2f0614bbeefb21a89141ba1f775e MD5 78384e6b77d8f0d4816a7137db475315 files/rrdtool-1.2.15-mem-usage.patch 4039 RMD160 674ac6fd1ec441776d3b364c919411a991baf162 files/rrdtool-1.2.15-mem-usage.patch 4039 @@ -10,34 +13,37 @@ AUX rrdtool-1.2.15-no-man.patch 951 RMD160 098eeee5b79e72b7a52f64791496cd6f33027 MD5 b99841a92f3429f741b4bf7fbd3da60e files/rrdtool-1.2.15-no-man.patch 951 RMD160 098eeee5b79e72b7a52f64791496cd6f33027344 files/rrdtool-1.2.15-no-man.patch 951 SHA256 adf121e31a1cea86ee97af0de71c6d76a666784121185ccb28055f433acff67f files/rrdtool-1.2.15-no-man.patch 951 +AUX rrdtool-1.2.19-as-needed.patch 643 RMD160 2ba4ebb4adc7e3c2c73eaec4c67c54795f0193ba SHA1 94dc6ea84f72e365e4f528e890f81ff771db0554 SHA256 2c71f269037798d1209f7b5ac95fd13fcb7bfe9e0ead7d809cd184afeda3319c +MD5 b2245f195742e9ade9d4e75f02348117 files/rrdtool-1.2.19-as-needed.patch 643 +RMD160 2ba4ebb4adc7e3c2c73eaec4c67c54795f0193ba files/rrdtool-1.2.19-as-needed.patch 643 +SHA256 2c71f269037798d1209f7b5ac95fd13fcb7bfe9e0ead7d809cd184afeda3319c files/rrdtool-1.2.19-as-needed.patch 643 +AUX rrdtool-1.2.19-as-needed.patch-new 1232 RMD160 b2af9c4ec0dd65ea19e5a4d6ed9bab4c23a1972a SHA1 407866380de6315e55199796b61112eae3489b2f SHA256 b8b480c35db90ff7879bfcc3a79cec97bb99853b01a5e6f60f1a9733973c15a7 +MD5 62354aae61ef015effd80d8aa8cf6147 files/rrdtool-1.2.19-as-needed.patch-new 1232 +RMD160 b2af9c4ec0dd65ea19e5a4d6ed9bab4c23a1972a files/rrdtool-1.2.19-as-needed.patch-new 1232 +SHA256 b8b480c35db90ff7879bfcc3a79cec97bb99853b01a5e6f60f1a9733973c15a7 files/rrdtool-1.2.19-as-needed.patch-new 1232 +AUX rrdtool-1.2.19-tclbindings.patch 1059 RMD160 9fec18862afd42ec46b054dabc630610ebbcee59 SHA1 0b7b2bee4a936b051eb25e3c7e161d3785770d5e SHA256 0553bcc07adbbfb2b59dd8e2171568b30a980051a087850fd7d3ca884332cfc8 +MD5 77d8b432139d1160afa944c3adddf7c4 files/rrdtool-1.2.19-tclbindings.patch 1059 +RMD160 9fec18862afd42ec46b054dabc630610ebbcee59 files/rrdtool-1.2.19-tclbindings.patch 1059 +SHA256 0553bcc07adbbfb2b59dd8e2171568b30a980051a087850fd7d3ca884332cfc8 files/rrdtool-1.2.19-tclbindings.patch 1059 DIST rrdtool-1.0.49.tar.gz 1466897 RMD160 965cf352b4d3da64fdf44e0af5d1cf95072a283e SHA1 259a8445e429f0f04b59b0a959d965cd5a17eafb SHA256 20acb0aa347f1629c4d5529ab8afbe4986fe820555049af3f905653300e5ea74 -DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91 DIST rrdtool-1.2.15.tar.gz 1043064 RMD160 493e5b108ac363484eb4015c0962945c5fb9fb9e SHA1 4ac695aff26ab193a083c65513aad06ff36bad82 SHA256 b33d68da8a39bb0fc745c0202f3a58e73bfc6a9fd35d71fbd8979d40a5ef7397 -DIST rrdtool-1.2.18.tar.gz 1060451 RMD160 6287c61ffe6742ad16d93d3b4352a407713f0241 SHA1 e65c246c3e4cffcf992d3d3e3a844bf5788a92ec SHA256 85e6baa0911e51e0703adb774d6904d0d77cab05180d2875188b35ae7c9b2ebd +DIST rrdtool-1.2.19.tar.gz 1060598 RMD160 05c46a7f035949923245da287e5faae0b02f45f1 SHA1 c548a1530724b35f86cce9581ca1a596677bf799 SHA256 7899cd034ac15cf15c1b78c22d4d6241a73d3079d5e756eb2a741ff93a952af1 EBUILD rrdtool-1.0.49.ebuild 2723 RMD160 f0ab21d381a58a4906b6a5509f280a257e2e524b SHA1 27299d3bbef2917db3e8c25f362d9b10251bacef SHA256 6f5f8e0b3b34956cc2edbbd693e85b4cd32f3f96cb2186f3aa18800b6bef898a MD5 b42b584a18854009623d1ab9edfc96ff rrdtool-1.0.49.ebuild 2723 RMD160 f0ab21d381a58a4906b6a5509f280a257e2e524b rrdtool-1.0.49.ebuild 2723 SHA256 6f5f8e0b3b34956cc2edbbd693e85b4cd32f3f96cb2186f3aa18800b6bef898a rrdtool-1.0.49.ebuild 2723 -EBUILD rrdtool-1.0.50.ebuild 2748 RMD160 ee3a11d421f3cf9611954d648bad662d075574ac SHA1 51082cf4952363132e453e4389559d37b9b3fd44 SHA256 cde76112aa61c13e4781ae3527aa2405bbfa75867fec98e98fb2a4f0c690be59 -MD5 2e4a97ccbf5a3f7273dc0a89af25fcbf rrdtool-1.0.50.ebuild 2748 -RMD160 ee3a11d421f3cf9611954d648bad662d075574ac rrdtool-1.0.50.ebuild 2748 -SHA256 cde76112aa61c13e4781ae3527aa2405bbfa75867fec98e98fb2a4f0c690be59 rrdtool-1.0.50.ebuild 2748 -EBUILD rrdtool-1.2.15-r2.ebuild 2874 RMD160 3138905b4fb8da33745945dbfd84c0e4d28006d8 SHA1 9634feb6772372805c14d20f2c6416d1f52edc57 SHA256 3673d4443fb3040ae243e7938d3710012632f4ce919b5bcfa7f3bc4d51a779a5 -MD5 fd879021ca0ddc7a13461cb32cd20c44 rrdtool-1.2.15-r2.ebuild 2874 -RMD160 3138905b4fb8da33745945dbfd84c0e4d28006d8 rrdtool-1.2.15-r2.ebuild 2874 -SHA256 3673d4443fb3040ae243e7938d3710012632f4ce919b5bcfa7f3bc4d51a779a5 rrdtool-1.2.15-r2.ebuild 2874 EBUILD rrdtool-1.2.15-r3.ebuild 2914 RMD160 fc0ea4b58a6413d5749eaa838db9ade120317930 SHA1 bf63c6de1bedcd2a03865a9cf8f9eec828885feb SHA256 b1f532af6b49a723823deefc8600e02c8040e7b16c2795a37f25f2735c044193 MD5 9b97aed012e28da3807b9a25d6e4cfeb rrdtool-1.2.15-r3.ebuild 2914 RMD160 fc0ea4b58a6413d5749eaa838db9ade120317930 rrdtool-1.2.15-r3.ebuild 2914 SHA256 b1f532af6b49a723823deefc8600e02c8040e7b16c2795a37f25f2735c044193 rrdtool-1.2.15-r3.ebuild 2914 -EBUILD rrdtool-1.2.18.ebuild 2890 RMD160 99c3a57416e4fab99a0696e05b27f366f8a18e93 SHA1 6486d745c3feb20fce5d5de9e30cbed0b735bb5c SHA256 d1b85657cb5153fb21666e19e39e0c7d574cf40b85870877fe5057af6710abe5 -MD5 bf4c0d4a9d147bf403ed23afaa15ab6f rrdtool-1.2.18.ebuild 2890 -RMD160 99c3a57416e4fab99a0696e05b27f366f8a18e93 rrdtool-1.2.18.ebuild 2890 -SHA256 d1b85657cb5153fb21666e19e39e0c7d574cf40b85870877fe5057af6710abe5 rrdtool-1.2.18.ebuild 2890 -MISC ChangeLog 17776 RMD160 80e0fb196e86a76168774ccb1af246ae3a87e8d0 SHA1 aac1c5d4f9fa60603b61c846d7992832bedf2b98 SHA256 3df430e59d7dd60a00c305f9e52aea517346cef0d84eb9ed3e022ccf19bcd747 -MD5 eb506f185c24c6ffe6f13758f59cf0ca ChangeLog 17776 -RMD160 80e0fb196e86a76168774ccb1af246ae3a87e8d0 ChangeLog 17776 -SHA256 3df430e59d7dd60a00c305f9e52aea517346cef0d84eb9ed3e022ccf19bcd747 ChangeLog 17776 +EBUILD rrdtool-1.2.19.ebuild 2436 RMD160 54b0360463ae0aee41f4b82a0a02de31cc31b27a SHA1 fe85d1b9fe654c39e0c7281dc37ebea427d4811f SHA256 7c7b63e62b1b4b210d4d81a9d044b33591ca6d4a09fa7daf3997ea33f22ace33 +MD5 61cf326cf36b2b84d658aeee8de8df87 rrdtool-1.2.19.ebuild 2436 +RMD160 54b0360463ae0aee41f4b82a0a02de31cc31b27a rrdtool-1.2.19.ebuild 2436 +SHA256 7c7b63e62b1b4b210d4d81a9d044b33591ca6d4a09fa7daf3997ea33f22ace33 rrdtool-1.2.19.ebuild 2436 +MISC ChangeLog 18318 RMD160 d388ef2ce95daf08cca67f2754e66a1660cc77a5 SHA1 54fc2d3fd1a29ab9a73b75f6856eb74de2a00672 SHA256 d2270fcb08cfd75154162d8fd61938fdd00ea1f858438c3c06b35fe62bf4d06e +MD5 cdfdef4ead7b15b99d85b6632eecfb2a ChangeLog 18318 +RMD160 d388ef2ce95daf08cca67f2754e66a1660cc77a5 ChangeLog 18318 +SHA256 d2270fcb08cfd75154162d8fd61938fdd00ea1f858438c3c06b35fe62bf4d06e ChangeLog 18318 MISC metadata.xml 241 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 SHA1 01721f8bf6f699f3647589a173ef1941fbd6dd1c SHA256 de63c7fc765937d32e93bda47d365a2e044ad3c6a70caff4ff5916dde97e6a3c MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 metadata.xml 241 @@ -45,15 +51,16 @@ SHA256 de63c7fc765937d32e93bda47d365a2e044ad3c6a70caff4ff5916dde97e6a3c metadata MD5 4717359c4cd628c2076e69285fb84e77 files/digest-rrdtool-1.0.49 247 RMD160 ddc06d4005032945b7a277d7758d0a027ee0d278 files/digest-rrdtool-1.0.49 247 SHA256 92be4e02f4dea82bae2aa9aa72910563d09b11a05b09327a6053e9648650286d files/digest-rrdtool-1.0.49 247 -MD5 782e5107553dbc7a507987831a70b5c0 files/digest-rrdtool-1.0.50 247 -RMD160 f38bd9ccc0e33b5dd499a2a2f279cedbc3d7fb6e files/digest-rrdtool-1.0.50 247 -SHA256 bc03acab926e1ac962e48cb11f524fabe81694daf2ad6b78426abad09f9ecc49 files/digest-rrdtool-1.0.50 247 -MD5 d04040e7f409bdc7d2ab4fce17702cdf files/digest-rrdtool-1.2.15-r2 247 -RMD160 772add36b866e1107c42ba47f6b9f6e938a758c4 files/digest-rrdtool-1.2.15-r2 247 -SHA256 62ab296ac4fc6e30708d669ec3df2e44b159d3b5075b047d2f551d4e1dea6f5b files/digest-rrdtool-1.2.15-r2 247 MD5 d04040e7f409bdc7d2ab4fce17702cdf files/digest-rrdtool-1.2.15-r3 247 RMD160 772add36b866e1107c42ba47f6b9f6e938a758c4 files/digest-rrdtool-1.2.15-r3 247 SHA256 62ab296ac4fc6e30708d669ec3df2e44b159d3b5075b047d2f551d4e1dea6f5b files/digest-rrdtool-1.2.15-r3 247 -MD5 2d05dc2206c49ebca037710a036614aa files/digest-rrdtool-1.2.18 247 -RMD160 9f4572eb6bd52aa86afb73e9d26814d6213ca5eb files/digest-rrdtool-1.2.18 247 -SHA256 0b03b31deda09a31650d7b63fd33127d065454b1a10b041fd67701ceab01b1f5 files/digest-rrdtool-1.2.18 247 +MD5 e4ce6ce249e3aebc4c175f83596ebeff files/digest-rrdtool-1.2.19 247 +RMD160 bef30d6f3f07ab0232fb042acb5b7500e43f9436 files/digest-rrdtool-1.2.19 247 +SHA256 dc7710b75149649c95ebe60e9f1fae701d87415caeb492e81e9cc76a19c6d6a4 files/digest-rrdtool-1.2.19 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFwf3Bz974XjDVpbkRAuGIAKCDsxvirGKAWnF+EHHNgCJ2mpSRowCfQyjC +ucIdh8TBKZ0OO5hYTyaTkyE= +=lezx +-----END PGP SIGNATURE----- diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.50 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.50 deleted file mode 100644 index 2df8ef4c759e..000000000000 --- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.50 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c466e2e7df95fa8e318e46437da87686 rrdtool-1.0.50.tar.gz 1474200 -RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b rrdtool-1.0.50.tar.gz 1474200 -SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91 rrdtool-1.0.50.tar.gz 1474200 diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.15-r2 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.15-r2 deleted file mode 100644 index 4a38035815c3..000000000000 --- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.15-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bde8b12c202bc4e27fb9a9588a0aaddf rrdtool-1.2.15.tar.gz 1043064 -RMD160 493e5b108ac363484eb4015c0962945c5fb9fb9e rrdtool-1.2.15.tar.gz 1043064 -SHA256 b33d68da8a39bb0fc745c0202f3a58e73bfc6a9fd35d71fbd8979d40a5ef7397 rrdtool-1.2.15.tar.gz 1043064 diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.18 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.18 deleted file mode 100644 index 38372ebccc42..000000000000 --- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.18 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0c116d031275b7e0da1f8326d52d097d rrdtool-1.2.18.tar.gz 1060451 -RMD160 6287c61ffe6742ad16d93d3b4352a407713f0241 rrdtool-1.2.18.tar.gz 1060451 -SHA256 85e6baa0911e51e0703adb774d6904d0d77cab05180d2875188b35ae7c9b2ebd rrdtool-1.2.18.tar.gz 1060451 diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.19 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.19 new file mode 100644 index 000000000000..d760d385bb3d --- /dev/null +++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.19 @@ -0,0 +1,3 @@ +MD5 df625d12e0585042a398ff946e32e3e7 rrdtool-1.2.19.tar.gz 1060598 +RMD160 05c46a7f035949923245da287e5faae0b02f45f1 rrdtool-1.2.19.tar.gz 1060598 +SHA256 7899cd034ac15cf15c1b78c22d4d6241a73d3079d5e756eb2a741ff93a952af1 rrdtool-1.2.19.tar.gz 1060598 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch new file mode 100644 index 000000000000..debb4195804d --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch @@ -0,0 +1,17 @@ +diff -urN ./rrdtool-1.2.19/bindings/python/Makefile.am ./rrdtool-1.2.18/bindings/python/Makefile.am +--- ./rrdtool-1.2.19-orig/bindings/python/Makefile.am 2007-02-01 06:51:38.000000000 +0100 ++++ ./rrdtool-1.2.19/bindings/python/Makefile.am 2007-01-23 21:54:50.000000000 +0100 +@@ -2,10 +2,11 @@ + + pyexec_PROGRAMS = rrdtoolmodule.so + ++rrdtoolmodule_so_LDFLAGS = -module -shared + rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la +-rrdtoolmodule_so_SOURCES = rrdtoolmodule.c ++rrdtoolmodule_so_SOURCES = rrdtoolmodule.c + +-noinst_HEADERS = rrd_extra.h ++noinst_HEADERS = rrd_extra.h + + clean-local: + rm -rf build diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch-new b/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch-new new file mode 100644 index 000000000000..b492021108eb --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch-new @@ -0,0 +1,28 @@ +diff -urN ./rrdtool-1.2.19/bindings/python/Makefile.am ./rrdtool-1.2.18/bindings/python/Makefile.am +--- ./rrdtool-1.2.19-orig/bindings/python/Makefile.am 2007-02-01 06:51:38.000000000 +0100 ++++ ./rrdtool-1.2.19/bindings/python/Makefile.am 2007-01-23 21:54:50.000000000 +0100 +@@ -2,10 +2,11 @@ + + pyexec_PROGRAMS = rrdtoolmodule.so + ++rrdtoolmodule_so_LDFLAGS = -module -shared + rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la +-rrdtoolmodule_so_SOURCES = rrdtoolmodule.c ++rrdtoolmodule_so_SOURCES = rrdtoolmodule.c + +-noinst_HEADERS = rrd_extra.h ++noinst_HEADERS = rrd_extra.h + + clean-local: + rm -rf build +diff -urN ./rrdtool-1.2.19/bindings/python/Makefile.in ./rrdtool-1.2.18/bindings/python/Makefile.in +--- ./rrdtool-1.2.19-orig/bindings/python/Makefile.in 2007-02-01 06:52:06.000000000 +0100 ++++ ./rrdtool-1.2.19/bindings/python/Makefile.in 2007-01-23 21:55:36.000000000 +0100 +@@ -233,6 +233,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + AM_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/src @PYTHON_INCLUDES@ ++rrdtoolmodule_so_LDFLAGS = -module -shared + rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la + rrdtoolmodule_so_SOURCES = rrdtoolmodule.c + noinst_HEADERS = rrd_extra.h diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.19-tclbindings.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.19-tclbindings.patch new file mode 100644 index 000000000000..35c729d43536 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.2.19-tclbindings.patch @@ -0,0 +1,26 @@ +diff -urN ./rrdtool-1.2.19/bindings/tcl/tclrrd.c ./rrdtool-1.2.19-new/bindings/tcl/tclrrd.c +--- ./rrdtool-1.2.19-orig/bindings/tcl/tclrrd.c 2007-02-01 06:51:38.000000000 +0100 ++++ ./rrdtool-1.2.19/bindings/tcl/tclrrd.c 2007-02-01 14:40:33.000000000 +0100 +@@ -18,8 +18,8 @@ + #include + #include + #include +-#include +-#include ++#include "../../src/rrd_tool.h" ++#include "../../src/rrd_format.h" + + /* support pre-8.4 tcl */ + +diff -urN ./rrdtool-1.2.19-orig/configure.ac ./rrdtool-1.2.19/configure.ac +--- ./rrdtool-1.2.19-orig/configure.ac 2007-02-01 06:51:40.000000000 +0100 ++++ ./rrdtool-1.2.19/configure.ac 2007-02-01 14:45:55.000000000 +0100 +@@ -554,7 +554,7 @@ + AC_MSG_WARN([tclConfig.sh not found - Tcl interface won't be built]) + else + . $tcl_config +- TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION" ++ TCL_PACKAGE_DIR="${TCL_PACKAGE_PATH% *}/tclrrd$VERSION" + fi + AC_ARG_ENABLE(tcl,[ --enable-tcl-site install the tcl extension in the tcl tree], + [],[enable_tcl_site=yes]) diff --git a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild deleted file mode 100644 index 86e436aa3ef1..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild,v 1.3 2007/01/05 07:09:32 flameeyes Exp $ - -inherit perl-module flag-o-matic eutils - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/" -SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/rrdtool-1.0.x/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64" -IUSE="perl tcl" - -DEPEND="perl? ( dev-lang/perl ) - sys-apps/gawk - >=media-libs/gd-1.8.3" -RDEPEND="tcl? ( dev-lang/tcl )" - -TCL_VER="" - -pkg_setup() { - use perl && perl-module_pkg_setup -} - -src_unpack() { - unpack ${A} - cd ${S} - sed -e 's/^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in - - if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then - die "Makefile.in sed failed" - fi -} - -src_compile() { - filter-mfpmath sse - filter-flags -ffast-math - - local myconf - myconf="${myconf} --datadir=/usr/share --enable-shared" - - if use tcl ; then - myconf="${myconf} --with-tcllib=/usr/lib" - else - myconf="${myconf} --without-tcllib" - fi - - if use perl; then - econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed" - - # libraries without -fPIC? feh! - for libdir in cgilib* gd* libpng* zlib*; do - sed -i -e 's/^CFLAGS.*/& -fPIC/' ${libdir}/Makefile - done - else - econf ${myconf} || die "econf failed" - fi - - make || die "make failed" -} - -src_install() { - einstall || die - - # this package completely ignores mandir settings - - doman doc/*.1 - dohtml doc/*.html - dodoc doc/*.pod - dodoc doc/*.txt - - rm -rf ${D}/usr/doc - rm -rf ${D}/usr/html - rm -rf ${D}/usr/man - rm -rf ${D}/usr/contrib - rm -rf ${D}/usr/examples - - insinto /usr/share/doc/${PF}/examples - doins examples/* - insinto /usr/share/doc/${PF}/contrib - doins contrib/* - - if use perl ; then - perlinfo - mytargets="site-perl-install" - perl-module_src_install || die - - # remove duplicate installation into /usr/lib/perl - rm -Rf ${D}/usr/lib/perl - fi - - if use tcl ; then -# mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so -# insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV} -# doins ${S}/tcl/tclrrd${PV}.so - echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \ - >> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl - fi - - dodoc COPY* CONTR* README TODO -} - -pkg_preinst() { - use perl && perl-module_pkg_preinst -} - -pkg_postinst() { - use perl && perl-module_pkg_postinst -} - -pkg_prerm() { - use perl && perl-module_pkg_prerm -} - -pkg_postrm() { - use perl && perl-module_pkg_postrm -} diff --git a/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild deleted file mode 100644 index 69cd6a55a6af..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild,v 1.12 2007/01/09 08:10:08 corsair Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit perl-module flag-o-matic eutils multilib autotools - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/" -SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86" -IUSE="doc perl python rrdcgi tcl uclibc" - -RDEPEND="tcl? ( dev-lang/tcl ) - >=sys-libs/zlib-1.2.1 - >=media-libs/freetype-2.1.5 - >=media-libs/libart_lgpl-2.3.16 - >=media-libs/libpng-1.2.5 - rrdcgi? ( >=dev-libs/cgilib-0.5 )" - -DEPEND="${RDEPEND} - perl? ( dev-lang/perl ) - python? ( dev-lang/python ) - sys-apps/gawk" - -TCLVER="" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e 's::"../../src/rrd_\1":g' \ - bindings/tcl/tclrrd.c || die "sed failed" - sed -i -e 's:-lrrd_private:-ltcl -lrrd:' \ - bindings/tcl/Makefile.* || die "sed failed" - sed -i -e 's:python_PROGRAMS:pyexec_PROGRAMS:' \ - bindings/python/Makefile.* || die "sed failed" - sed -i -e 's:\$TCL_PACKAGE_PATH:${TCL_PACKAGE_PATH%% *}:' \ - configure.ac - epatch "${FILESDIR}"/${P}-newstyle-resize.patch - use uclibc && epatch "${FILESDIR}"/${P}-no-man.patch - eautoreconf -} - -pkg_setup() { - use perl && perl-module_pkg_setup -} - -src_compile() { - filter-mfpmath sse - filter-flags -ffast-math - - local myconf - myconf="--datadir=/usr/share --enable-shared" - - if use tcl ; then - myconf="${myconf} --with-tcllib=/usr/$(get_libdir)" - else - myconf="${myconf} --disable-tcl" - fi - - use python || myconf="${myconf} --disable-python" - - if use perl ; then - econf ${myconf} \ - $(use_enable rrdcgi) \ - --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \ - die "econf failed" - else - econf ${myconf} \ - $(use_enable rrdcgi) \ - --disable-perl || die "econf failed" - fi - - make || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - rm -fr "${D}"/usr/examples - rm -fr "${D}"/usr/shared - - if use doc ; then - dohtml doc/*.html - dodoc doc/*.pod - dodoc doc/*.txt - insinto /usr/share/doc/${PF}/examples - doins examples/* - insinto /usr/share/doc/${PF}/contrib - doins contrib/* - fi - - if use perl ; then - perlinfo - mytargets="site-perl-install" - perl-module_src_install || die - - # remove duplicate installation into /usr/lib/perl - rm -Rf "${D}"/usr/lib/perl - fi - - dodoc CONTRIBUTORS README TODO -} - -pkg_preinst() { - use perl && perl-module_pkg_preinst -} - -pkg_postinst() { - use perl && perl-module_pkg_postinst -} - -pkg_prerm() { - use perl && perl-module_pkg_prerm -} - -pkg_postrm() { - use perl && perl-module_pkg_postrm -} diff --git a/net-analyzer/rrdtool/rrdtool-1.2.18.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild similarity index 65% rename from net-analyzer/rrdtool/rrdtool-1.2.18.ebuild rename to net-analyzer/rrdtool/rrdtool-1.2.19.ebuild index 2aaa237d7573..a998bacc2511 100644 --- a/net-analyzer/rrdtool/rrdtool-1.2.18.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild @@ -1,11 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.18.ebuild,v 1.2 2007/01/24 21:26:46 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild,v 1.1 2007/02/01 14:48:52 jokey Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit perl-module flag-o-matic eutils multilib autotools +inherit autotools eutils flag-o-matic multilib perl-module DESCRIPTION="A system to store and display time-series data" HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/" @@ -33,15 +30,9 @@ TCLVER="" src_unpack() { unpack ${A} cd "${S}" - sed -i -e 's::"../../src/rrd_\1":g' \ - bindings/tcl/tclrrd.c || die "sed failed" - sed -i -e 's:-lrrd_private:-ltcl -lrrd:' \ - bindings/tcl/Makefile.* || die "sed failed" - sed -i -e 's:python_PROGRAMS:pyexec_PROGRAMS:' \ - bindings/python/Makefile.* || die "sed failed" - sed -i -e 's:\$TCL_PACKAGE_PATH:${TCL_PACKAGE_PATH%% *}:' \ - configure.ac epatch "${FILESDIR}"/${PN}-1.2.15-newstyle-resize.patch + epatch "${FILESDIR}"/${P}-as-needed.patch + epatch "${FILESDIR}"/${P}-tclbindings.patch use uclibc && epatch "${FILESDIR}"/${PN}-1.2.15-no-man.patch eautoreconf } @@ -55,7 +46,9 @@ src_compile() { filter-flags -ffast-math local myconf - myconf="--datadir=/usr/share --enable-shared" + myconf="--datadir=/usr/share --enable-shared $(use_enable rrdcgi)" + + use python || myconf="${myconf} --disable-python" if use tcl ; then myconf="${myconf} --with-tcllib=/usr/$(get_libdir)" @@ -63,32 +56,24 @@ src_compile() { myconf="${myconf} --disable-tcl" fi - use python || myconf="${myconf} --disable-python" - if use perl ; then - econf ${myconf} \ - $(use_enable rrdcgi) \ - --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \ - die "econf failed" + econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed" else - econf ${myconf} \ - $(use_enable rrdcgi) \ - --disable-perl || die "econf failed" + econf ${myconf} --disable-perl || die "econf failed" fi - make || die "make failed" + emake || die "make failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" rm -fr "${D}"/usr/examples rm -fr "${D}"/usr/shared if use doc ; then dohtml doc/*.html - dodoc doc/*.pod - dodoc doc/*.txt + dodoc doc/*.pod doc/*.txt insinto /usr/share/doc/${PF}/examples doins examples/* insinto /usr/share/doc/${PF}/contrib @@ -99,9 +84,6 @@ src_install() { perlinfo mytargets="site-perl-install" perl-module_src_install || die - - # remove duplicate installation into /usr/lib/perl - rm -Rf "${D}"/usr/lib/perl fi dodoc CONTRIBUTORS README TODO