rrdtool with robbat2's updated newstyle-resize.patch...

svn path=/; revision=198

5 files changed, 283 insertions, 159 deletions

diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index ba155b7..a635bac 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,5 +1,6 @@
-AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
-DIST rrdtool-1.3.0.tar.gz 1101980 RMD160 c5d6665f22155bb6801e83cf9ec931b776cfcc2b SHA1 c80572b3b74a3a58b83d83edcbcaf295f9a37538 SHA256 2d2f365d12ac9e0d7b13ebeba185ef9380a1df7e1a769eb8a8519d68a3de9d41
-EBUILD rrdtool-1.3.0.ebuild 2732 RMD160 4d91902c06ecb024187a8a66ebcf53f793c7142c SHA1 cf5f390d6d5e99c25b63338a3b7cf9bc95406c5f SHA256 abf6b3e58f90398e0554ff9ff06857640882474e8d564427cd35e5760d9175fe
+AUX rrdtool-1.3-newstyle-resize.patch 4875 RMD160 3d511c224aae19683c6702c91ace5959a38397a6 SHA1 dba4ed5d3387e456be10e8a188a36737ff7d3b53 SHA256 aac0f0e866ef2a582276d36c5405f4832f466edbfef4f2a7819d13131d9ad3db
+AUX rrdtool-1.3.3-newstyle-resize.patch 4751 RMD160 73120f496de98c8484098aa5fb22a30b1a9b629c SHA1 c092ac7df2c1a37e1dd62281d58650bbc0d8b500 SHA256 82a891ce12338fbb2f8a5a149fc3e8a330262f938de0d9c35137fd14d99d50c4
+DIST rrdtool-1.3.3.tar.gz 1064805 RMD160 e1f6410eef0524548525708fd4ea2b97c3571010 SHA1 1a1b028f14931c9fb4a2b62af40f506fe8e65cc2 SHA256 f21a5dc4db3d6884588d25d88a940a70991f9562ddaff8e117ab0c86ed038d2c
+EBUILD rrdtool-1.3.3.ebuild 2537 RMD160 2bfcb8beabadb1af4238fac9fa685eed50397c1e SHA1 b4fae4da685e4ef58e62de524058875304e7388b SHA256 41c080fe2abb6676da2f92e66335516ccc3464eaeb9aae89815e830961265c1a
 MISC ChangeLog 21730 RMD160 657dc6e9048d7b16da8478742bf86505dffc1202 SHA1 8ceec514cf0da8498837fc6327bdf387f562678d SHA256 3c9235167f42bb9d29f8e136c99da526a726e687373d82d08dcd34fd4d870df8
 MISC metadata.xml 241 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 SHA1 01721f8bf6f699f3647589a173ef1941fbd6dd1c SHA256 de63c7fc765937d32e93bda47d365a2e044ad3c6a70caff4ff5916dde97e6a3c
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.15-newstyle-resize.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.15-newstyle-resize.patch
deleted file mode 100644
index 52b8c00..0000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.15-newstyle-resize.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Add support for a more useful resize method, that allows setting of the number
-of rows, instead of requiring manual calculation.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude '*.txt' --exclude '*.html' --exclude '*.1' --exclude autom4te.cache --exclude bindings /dev/shm/portage/rrdtool-1.2.15/work/rrdtool-1.2.15/doc/rrdresize.pod /dev/shm/portage/rrdtool-1.2.15-r1/work/rrdtool-1.2.15/doc/rrdresize.pod
---- rrdtool-1.2.15.orig/doc/rrdresize.pod	2006-07-14 05:11:26.000000000 -0700
-+++ rrdtool-1.2.15/doc/rrdresize.pod	2006-07-21 01:56:56.333392940 -0700
-@@ -6,6 +6,8 @@
- 
- B<rrdtool> B<resize> I<filename> I<rra-num>  B<GROW>I<|>B<SHRINK> I<rows>
- 
-+B<rrdtool> B<resize> I<filename> I<rra-num>  [B<+>B<->B<=>]I<rows>
-+
- =head1 DESCRIPTION
- 
- The B<resize> function is used to modify the number of rows in
-@@ -23,17 +25,20 @@
- 
- =item B<GROW>
- 
--used if you want to add extra rows to an RRA. The extra rows will be inserted
--as the rows that are oldest.
-+(old style) used if you want to add extra rows to an RRA. The extra rows will
-+be inserted as the rows that are oldest.
- 
- =item B<SHRINK>
- 
--used if you want to remove rows from an RRA. The rows that will be removed
--are the oldest rows.
-+(old style) used if you want to remove rows from an RRA. The rows that will be
-+removed are the oldest rows.
- 
--=item I<rows>
-+=item [B<+>B<->B<=>]I<rows>
- 
--the number of rows you want to add or remove.
-+the number of rows you want to add or remove. when prefixed with any of B<+>,
-+B<-> or B<=>, the B<GROW>I<|>B<SHRINK> argument is not required, and instead
-+the prefix specifies to add (B<+>) I<rows>, remove (B<->) I<rows>, or set to
-+exactly (B<=>) I<rows>.
- 
- =back
- 
-diff -Nuar --exclude '*~' --exclude '*.txt' --exclude '*.html' --exclude '*.1' --exclude autom4te.cache --exclude bindings /dev/shm/portage/rrdtool-1.2.15/work/rrdtool-1.2.15/src/rrd_resize.c /dev/shm/portage/rrdtool-1.2.15-r1/work/rrdtool-1.2.15/src/rrd_resize.c
---- rrdtool-1.2.15.orig/src/rrd_resize.c	2006-07-14 05:11:26.000000000 -0700
-+++ rrdtool-1.2.15/src/rrd_resize.c	2006-07-21 03:09:45.656705610 -0700
-@@ -19,7 +19,7 @@
-     unsigned long	l,rra;
-     long		modify;
-     unsigned long	target_rra;
--    int			grow=0,shrink=0;
-+    int			grow=0,shrink=0,setsize=0,newstyle=0;
-     char		*endptr;
- 
-     infilename=argv[1];
-@@ -27,7 +27,7 @@
-         rrd_set_error("resize.rrd is a reserved name");
-         return(-1);
-     }
--    if (argc!=5) {
-+    if (argc!=5 && argc != 4) {
-         rrd_set_error("wrong number of parameters");
-         return(-1);
-     }
-@@ -36,20 +36,39 @@
- 
-     if (!strcmp(argv[3],"GROW")) grow=1;
-     else if (!strcmp(argv[3],"SHRINK")) shrink=1;
-+	else if (argv[3][0] == '=' || argv[3][0] == '-' || argv[3][0] == '+') newstyle=3;
-     else {
-         rrd_set_error("I can only GROW or SHRINK");
-         return(-1);
-     }
- 
--    modify=strtol(argv[4],&endptr,0);
--
--    if ((modify<1)) {
--        rrd_set_error("Please grow or shrink with at least 1 row");
--        return(-1);
--    }
--
--    if (shrink) modify = -modify;
-+	// if the size starts with a character (=-+) then it's the new style
-+	// instead. This is an extra mode so we can allow
-+	// rrdtool resize FOO.rrd 5 GROW =5
-+	if(argc == 5 && (argv[4][0] == '=' || argv[4][0] == '-' || argv[4][0] == '+')) {
-+		newstyle = 4;
-+	}
-+	if(newstyle > 0) {
-+		setsize = argv[newstyle][0] == '=' ? 1 : 0;
-+		/* If we see a + or a -, then the codepath is simple */
-+		grow = argv[newstyle][0] == '+' ? 1 : 0;
-+		shrink = argv[newstyle][0] == '-' ? 1 : 0;
-+		modify=strtol(argv[newstyle]+1,&endptr,0);
-+		if(modify == 0) {
-+			rrd_set_error("Refusing to add/delete/set with 0 rows");
-+			return(-1);
-+		}
-+	} else {
-+		/* this is the old code branch */
-+		modify=strtol(argv[4],&endptr,0);
-+
-+		if ((modify<1)) {
-+			rrd_set_error("Please grow or shrink with at least 1 row");
-+			return(-1);
-+		}
- 
-+		if (shrink) modify = -modify;
-+	}
- 
-     if (rrd_open(infilename, &infile, &rrdold, RRD_READWRITE)==-1) {
-         rrd_set_error("could not open RRD");
-@@ -68,6 +87,17 @@
-         fclose(infile);
-         return(-1);
-     }
-+	/* if we are in setsize mode, we need to work out what modify factor to use */
-+	if(setsize > 0) {
-+		long oldsize = rrdold.rra_def[target_rra].row_cnt;
-+		long newsize = modify;
-+		// old=5, new=5 => modify = 0
-+		if(newsize == oldsize) {
-+			rrd_set_error("RRA is already set to that size!");
-+			return(-1);
-+		}
-+		modify = newsize-oldsize;
-+	}
- 
-     if (modify < 0)
- 	if ((long)rrdold.rra_def[target_rra].row_cnt <= -modify) {
-diff -Nuar --exclude '*~' --exclude '*.txt' --exclude '*.html' --exclude '*.1' --exclude autom4te.cache --exclude bindings /dev/shm/portage/rrdtool-1.2.15/work/rrdtool-1.2.15/src/rrd_tool.c /dev/shm/portage/rrdtool-1.2.15-r1/work/rrdtool-1.2.15/src/rrd_tool.c
---- rrdtool-1.2.15.orig/src/rrd_tool.c	2006-07-14 05:11:26.000000000 -0700
-+++ rrdtool-1.2.15/src/rrd_tool.c	2006-07-21 03:07:41.862541464 -0700
-@@ -152,6 +152,7 @@
- 
-     char help_resize[] =
- 	   " * resize - alter the length of one of the RRAs in an RRD\n\n"
-+	   "\trrdtool resize filename rranum <+|-|=>rows\n";
- 	   "\trrdtool resize filename rranum GROW|SHRINK rows\n\n";
- 
-     char help_xport[] =
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.3-newstyle-resize.patch b/net-analyzer/rrdtool/files/rrdtool-1.3-newstyle-resize.patch
new file mode 100644
index 0000000..75fb400
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.3-newstyle-resize.patch
@@ -0,0 +1,139 @@
+diff -Naur rrdtool-1.3.3.orig/doc/rrdresize.pod rrdtool-1.3.3/doc/rrdresize.pod
+--- rrdtool-1.3.3.orig/doc/rrdresize.pod	2008-03-15 13:39:48.000000000 +0300
++++ rrdtool-1.3.3/doc/rrdresize.pod	2008-09-16 20:53:42.000000000 +0400
+@@ -6,6 +6,8 @@
+ 
+ B<rrdtool> B<resize> I<filename> I<rra-num>  B<GROW>I<|>B<SHRINK> I<rows>
+ 
++B<rrdtool> B<resize> I<filename> I<rra-num>  [B<+>B<->B<=>]I<rows>
++
+ =head1 DESCRIPTION
+ 
+ The B<resize> function is used to modify the number of rows in
+@@ -23,17 +25,20 @@
+ 
+ =item B<GROW>
+ 
+-used if you want to add extra rows to an RRA. The extra rows will be inserted
+-as the rows that are oldest.
++(old style) used if you want to add extra rows to an RRA. The extra rows will
++be inserted as the rows that are oldest.
+ 
+ =item B<SHRINK>
+ 
+-used if you want to remove rows from an RRA. The rows that will be removed
+-are the oldest rows.
++(old style) used if you want to remove rows from an RRA. The rows that will be
++removed are the oldest rows.
+ 
+-=item I<rows>
++=item [B<+>B<->B<=>]I<rows>
+ 
+-the number of rows you want to add or remove.
++the number of rows you want to add or remove. when prefixed with any of B<+>,
++B<-> or B<=>, the B<GROW>I<|>B<SHRINK> argument is not required, and instead
++the prefix specifies to add (B<+>) I<rows>, remove (B<->) I<rows>, or set to
++exactly (B<=>) I<rows>.
+ 
+ =back
+ 
+diff -Naur rrdtool-1.3.3.orig/src/rrd_resize.c rrdtool-1.3.3/src/rrd_resize.c
+--- rrdtool-1.3.3.orig/src/rrd_resize.c	2008-09-15 00:32:10.000000000 +0400
++++ rrdtool-1.3.3/src/rrd_resize.c	2008-09-16 21:11:10.000000000 +0400
+@@ -19,7 +19,7 @@
+     unsigned long l, rra;
+     long      modify;
+     unsigned long target_rra;
+-    int       grow = 0, shrink = 0;
++    int       grow = 0, shrink = 0, setsize = 0, newstyle = 0;
+     char     *endptr;
+     rrd_file_t *rrd_file, *rrd_out_file;
+ 
+@@ -28,7 +28,7 @@
+         rrd_set_error("resize.rrd is a reserved name");
+         return (-1);
+     }
+-    if (argc != 5) {
++    if (argc != 5 && argc != 4) {
+         rrd_set_error("wrong number of parameters");
+         return (-1);
+     }
+@@ -39,20 +39,41 @@
+         grow = 1;
+     else if (!strcmp(argv[3], "SHRINK"))
+         shrink = 1;
++    else if (argv[3][0] == '=' || argv[3][0] == '-' || argv[3][0] == '+')
++        newstyle = 3;
+     else {
+         rrd_set_error("I can only GROW or SHRINK");
+         return (-1);
+     }
+ 
+-    modify = strtol(argv[4], &endptr, 0);
++    // if the size starts with a character (=-+) then it's the new style
++    // instead. This is an extra mode so we can allow
++    // rrdtool resize FOO.rrd 5 GROW =5
++    if(argc == 5 && (argv[4][0] == '=' || argv[4][0] == '-' || argv[4][0] == '+')) {
++        newstyle = 4;
++    }
++    if(newstyle > 0) {
++        setsize = argv[newstyle][0] == '=' ? 1 : 0;
++        /* If we see a + or a -, then the codepath is simple */
++        grow = argv[newstyle][0] == '+' ? 1 : 0;
++        shrink = argv[newstyle][0] == '-' ? 1 : 0;
++        modify = strtol(argv[newstyle]+1, &endptr, 0);
++        if(modify == 0) {
++            rrd_set_error("Refusing to add/delete/set with 0 rows");
++            return (-1);
++        }
++    } else {
++        /* this is the old code branch */
++        modify = strtol(argv[4], &endptr, 0);
+ 
+-    if ((modify < 1)) {
+-        rrd_set_error("Please grow or shrink with at least 1 row");
+-        return (-1);
+-    }
++        if ((modify < 1)) {
++            rrd_set_error("Please grow or shrink with at least 1 row");
++            return (-1);
++        }
+ 
+-    if (shrink)
+-        modify = -modify;
++        if (shrink)
++	    modify = -modify;
++    }
+ 
+ 
+     rrd_file = rrd_open(infilename, &rrdold, RRD_READWRITE | RRD_COPY);
+@@ -74,6 +95,18 @@
+         return (-1);
+     }
+ 
++    /* if we are in setsize mode, we need to work out what modify factor to use */
++    if(setsize > 0) {
++        long oldsize = rrdold.rra_def[target_rra].row_cnt;
++        long newsize = modify;
++        // old=5, new=5 => modify = 0
++        if(newsize == oldsize) {
++            rrd_set_error("RRA is already set to that size!");
++            return(-1);
++        }
++        modify = newsize-oldsize;
++    }
++
+     if (modify < 0)
+         if ((long) rrdold.rra_def[target_rra].row_cnt <= -modify) {
+             rrd_set_error("This RRA is not that big");
+diff -Naur rrdtool-1.3.3.orig/src/rrd_tool.c rrdtool-1.3.3/src/rrd_tool.c
+--- rrdtool-1.3.3.orig/src/rrd_tool.c	2008-09-15 00:32:10.000000000 +0400
++++ rrdtool-1.3.3/src/rrd_tool.c	2008-09-16 21:13:20.000000000 +0400
+@@ -186,6 +186,7 @@
+     const char *help_resize =
+         N_
+         (" * resize - alter the length of one of the RRAs in an RRD\n\n"
++         "\trrdtool resize filename rranum <+|-|=>rows\n"
+          "\trrdtool resize filename rranum GROW|SHRINK rows\n\n");
+     const char *help_xport =
+         N_("* xport - generate XML dump from one or several RRD\n\n"
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.3.3-newstyle-resize.patch b/net-analyzer/rrdtool/files/rrdtool-1.3.3-newstyle-resize.patch
new file mode 100644
index 0000000..45dd934
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.3.3-newstyle-resize.patch
@@ -0,0 +1,135 @@
+diff -Naur rrdtool-1.3.3.orig/doc/rrdresize.pod rrdtool-1.3.3/doc/rrdresize.pod
+--- rrdtool-1.3.3.orig/doc/rrdresize.pod	2008-03-15 13:39:48.000000000 +0300
++++ rrdtool-1.3.3/doc/rrdresize.pod	2008-09-16 20:53:42.000000000 +0400
+@@ -6,6 +6,8 @@
+ 
+ B<rrdtool> B<resize> I<filename> I<rra-num>  B<GROW>I<|>B<SHRINK> I<rows>
+ 
++B<rrdtool> B<resize> I<filename> I<rra-num>  [B<+>B<->B<=>]I<rows>
++
+ =head1 DESCRIPTION
+ 
+ The B<resize> function is used to modify the number of rows in
+@@ -23,17 +25,20 @@
+ 
+ =item B<GROW>
+ 
+-used if you want to add extra rows to an RRA. The extra rows will be inserted
+-as the rows that are oldest.
++(old style) used if you want to add extra rows to an RRA. The extra rows will
++be inserted as the rows that are oldest.
+ 
+ =item B<SHRINK>
+ 
+-used if you want to remove rows from an RRA. The rows that will be removed
+-are the oldest rows.
++(old style) used if you want to remove rows from an RRA. The rows that will be
++removed are the oldest rows.
+ 
+-=item I<rows>
++=item [B<+>B<->B<=>]I<rows>
+ 
+-the number of rows you want to add or remove.
++the number of rows you want to add or remove. when prefixed with any of B<+>,
++B<-> or B<=>, the B<GROW>I<|>B<SHRINK> argument is not required, and instead
++the prefix specifies to add (B<+>) I<rows>, remove (B<->) I<rows>, or set to
++exactly (B<=>) I<rows>.
+ 
+ =back
+ 
+diff -Naur rrdtool-1.3.3.orig/src/rrd_resize.c rrdtool-1.3.3/src/rrd_resize.c
+--- rrdtool-1.3.3.orig/src/rrd_resize.c	2008-09-15 00:32:10.000000000 +0400
++++ rrdtool-1.3.3/src/rrd_resize.c	2008-09-16 22:23:43.000000000 +0400
+@@ -19,7 +19,7 @@
+     unsigned long l, rra;
+     long      modify;
+     unsigned long target_rra;
+-    int       grow = 0, shrink = 0;
++    int       grow = 0, shrink = 0, setsize = 0, newstyle = 0;
+     char     *endptr;
+     rrd_file_t *rrd_file, *rrd_out_file;
+ 
+@@ -28,7 +28,7 @@
+         rrd_set_error("resize.rrd is a reserved name");
+         return (-1);
+     }
+-    if (argc != 5) {
++    if (argc != 5 && argc != 4) {
+         rrd_set_error("wrong number of parameters");
+         return (-1);
+     }
+@@ -39,18 +39,39 @@
+         grow = 1;
+     else if (!strcmp(argv[3], "SHRINK"))
+         shrink = 1;
++    else if (argv[3][0] == '=' || argv[3][0] == '-' || argv[3][0] == '+')
++        newstyle = 3;
+     else {
+         rrd_set_error("I can only GROW or SHRINK");
+         return (-1);
+     }
+ 
+-    modify = strtol(argv[4], &endptr, 0);
++    // if the size starts with a character (=-+) then it's the new style
++    // instead. This is an extra mode so we can allow
++    // rrdtool resize FOO.rrd 5 GROW =5
++    if(argc == 5 && (argv[4][0] == '=' || argv[4][0] == '-' || argv[4][0] == '+')) {
++        newstyle = 4;
++    }
++    if(newstyle > 0) {
++        setsize = argv[newstyle][0] == '=' ? 1 : 0;
++        /* If we see a + or a -, then the codepath is simple */
++        grow = argv[newstyle][0] == '+' ? 1 : 0;
++        shrink = argv[newstyle][0] == '-' ? 1 : 0;
++        modify = strtol(argv[newstyle]+1, &endptr, 0);
++        if(modify == 0) {
++            rrd_set_error("Refusing to add/delete/set with 0 rows");
++            return (-1);
++        }
++    } else {
++        /* this is the old code branch */
++        modify = strtol(argv[4], &endptr, 0);
+ 
+-    if ((modify < 1)) {
+-        rrd_set_error("Please grow or shrink with at least 1 row");
+-        return (-1);
++        if ((modify < 1)) {
++            rrd_set_error("Please grow or shrink with at least 1 row");
++            return (-1);
++        }
+     }
+-
++ 
+     if (shrink)
+         modify = -modify;
+ 
+@@ -74,6 +95,18 @@
+         return (-1);
+     }
+ 
++    /* if we are in setsize mode, we need to work out what modify factor to use */
++    if(setsize > 0) {
++        long oldsize = rrdold.rra_def[target_rra].row_cnt;
++        long newsize = modify;
++        // old=5, new=5 => modify = 0
++        if(newsize == oldsize) {
++            rrd_set_error("RRA is already set to that size!");
++            return(-1);
++        }
++        modify = newsize-oldsize;
++    }
++
+     if (modify < 0)
+         if ((long) rrdold.rra_def[target_rra].row_cnt <= -modify) {
+             rrd_set_error("This RRA is not that big");
+diff -Naur rrdtool-1.3.3.orig/src/rrd_tool.c rrdtool-1.3.3/src/rrd_tool.c
+--- rrdtool-1.3.3.orig/src/rrd_tool.c	2008-09-15 00:32:10.000000000 +0400
++++ rrdtool-1.3.3/src/rrd_tool.c	2008-09-16 21:13:20.000000000 +0400
+@@ -186,6 +186,7 @@
+     const char *help_resize =
+         N_
+         (" * resize - alter the length of one of the RRAs in an RRD\n\n"
++         "\trrdtool resize filename rranum <+|-|=>rows\n"
+          "\trrdtool resize filename rranum GROW|SHRINK rows\n\n");
+     const char *help_xport =
+         N_("* xport - generate XML dump from one or several RRD\n\n"
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.3.ebuild
index 2cc115c..588ef37 100644
--- a/net-analyzer/rrdtool/rrdtool-1.3.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.3.3.ebuild
@@ -6,13 +6,7 @@ inherit autotools eutils flag-o-matic multilib perl-module
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-if [[ ${PV} =~ rc ]] ; then
-MY_PV=${PV/_}
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/beta/${PN}-${MY_PV}.tar.gz"
-S=${WORKDIR}//${PN}-${MY_PV}
-else
 SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-fi
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,19 +31,16 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if ! built_with_use x11-libs/cairo svg; then
-		eerror "${PN} requires x11-libs/pango to be built with X USE flag."
-		die "Rebuild x11-libs/pango with X USE flag enabled."
+		eerror "${PN} requires x11-libs/cairo to be built with svg USE flag."
+		die "Rebuild x11-libs/cairo with svg USE flag enabled."
 	fi
+	use perl && perl-module_pkg_setup
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#epatch "${FILESDIR}"/${PN}-1.2.15-newstyle-resize.patch
-}
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
+	epatch "${FILESDIR}"/${P}-newstyle-resize.patch
 }
 
 src_compile() {
@@ -64,7 +55,7 @@ src_compile() {
 		$(use_enable perl perl-site-install) \
 		$(use_enable tcl) \
 		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python) || die "econf failed."
+		$(use_enable python)
 
 	emake || die "make failed"
 }