Version bumped. Updated SRC_URI and HOMEPAGE. Corrected LICENSE (it is not GPL-2 bug BSD). Tidy up ebuilds. Seems to fix bug #40153

10 files changed, 75 insertions, 661 deletions

diff --git a/dev-libs/xmlwrapp/ChangeLog b/dev-libs/xmlwrapp/ChangeLog
index e52e5a708ca2..dc03f680ba09 100644
--- a/dev-libs/xmlwrapp/ChangeLog
+++ b/dev-libs/xmlwrapp/ChangeLog
@@ -1,12 +1,14 @@
 # ChangeLog for dev-libs/xmlwrapp
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/ChangeLog,v 1.3 2003/07/12 09:22:23 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/ChangeLog,v 1.4 2004/02/21 11:40:12 usata Exp $
 
-*dvutil-0.13.3 (06 Mar 2003)
+*xmlwrapp-0.4.4 (21 Feb 2004)
 
-  06 Mar 2002; Pieter Van den Abeele<pvdabeel@gentoo.org> :
-
-  Created an ebuild - also tested on ppc
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> xmlwrapp-0.4.0.ebuild,
+  xmlwrapp-0.4.1.ebuild, xmlwrapp-0.4.4.ebuild, files/gentoo-0.4.0.patch,
+  files/gentoo-0.4.1.patch, files/mkmf, files/xmlwrapp-gentoo.diff:
+  Version bumped. Updated SRC_URI and HOMEPAGE. Corrected LICENSE (It is not
+  GPL-2 but BSD). Tidy up ebuilds. Seems to fix bug #40153
 
 *xmlwrapp-0.4.0 (25 Apr 2003)
  
diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
index 7892319420dc..8b4c508cb681 100644
--- a/dev-libs/xmlwrapp/Manifest
+++ b/dev-libs/xmlwrapp/Manifest
@@ -1,8 +1,9 @@
-MD5 794ea993d51bd74e3fc397c8e8eea784 ChangeLog 463
-MD5 1dba912d4342212cbe3d93c0bd31eb80 xmlwrapp-0.4.0.ebuild 873
-MD5 36a2c92157b59741fd40db229950a5ed xmlwrapp-0.4.1.ebuild 875
+MD5 43dabe88f5677eeb55990baae51b2c56 xmlwrapp-0.4.0.ebuild 837
+MD5 1bf6332834842baf5d16589aad684007 xmlwrapp-0.4.1.ebuild 839
+MD5 ef7040376f4d6849ae723e92acac8029 ChangeLog 713
+MD5 d8a3c4f7b8dcacf1bc1dcef8966d9ffc xmlwrapp-0.4.4.ebuild 933
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 b1480b5669c77166f57fc32f47bea65f files/digest-xmlwrapp-0.4.0 65
-MD5 55066e7026cd8b9a9f6820015d0a986c files/gentoo-0.4.0.patch 469
-MD5 f6290244a90a00fe306a84ae7b1659fb files/mkmf 18879
-MD5 55066e7026cd8b9a9f6820015d0a986c files/gentoo-0.4.1.patch 469
 MD5 a90d6cfcb5b3a610fbf22b58be4695b7 files/digest-xmlwrapp-0.4.1 66
+MD5 00b7f4c2544aca35df2b6186090bd1fa files/digest-xmlwrapp-0.4.4 66
+MD5 55066e7026cd8b9a9f6820015d0a986c files/xmlwrapp-gentoo.diff 469
diff --git a/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.4.4 b/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.4.4
new file mode 100644
index 000000000000..8c7936f3d7d9
--- /dev/null
+++ b/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.4.4
@@ -0,0 +1 @@
+MD5 4975137065da35919d2c54b34a7bbcb4 xmlwrapp-0.4.4.tar.gz 104564
diff --git a/dev-libs/xmlwrapp/files/gentoo-0.4.1.patch b/dev-libs/xmlwrapp/files/gentoo-0.4.1.patch
deleted file mode 100644
index 31f0315eef0f..000000000000
--- a/dev-libs/xmlwrapp/files/gentoo-0.4.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ori/configure.pl xmlwrapp-0.4.0/configure.pl
---- ori/configure.pl	2003-02-03 23:47:54.000000000 +0100
-+++ xmlwrapp-0.4.0/configure.pl	2003-03-24 12:21:07.000000000 +0100
-@@ -277,7 +277,7 @@
-     $output =~ s/-I//g;
-     my @include_dirs = split(/\s+/, $output);
-     my $main_include_dir = undef;
--    my $xslt_include_dir = undef;
-+    my $xslt_include_dir = "/usr/include/libxml2";
- 
-     foreach my $dir (@include_dirs) {
- 	if (-d "$dir${dirsep}libxml") {
diff --git a/dev-libs/xmlwrapp/files/mkmf b/dev-libs/xmlwrapp/files/mkmf
deleted file mode 100644
index a375dd43dd62..000000000000
--- a/dev-libs/xmlwrapp/files/mkmf
+++ /dev/null
@@ -1,621 +0,0 @@
-#! /usr/bin/perl
-######################################################################
-# Copyright (C) 2001-2002 Peter J Jones (pjones@pmade.org)
-# All Rights Reserved
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the Author nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR
-# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-################################################################################
-#
-# mkmf (Make a Makefile)
-# Peter J Jones (pjones@pmade.org)
-#
-# This file is part of cxxtools (http://pmade.org/pjones/software/cxxtools/)
-#
-################################################################################
-#
-# Includes
-#
-################################################################################
-use strict;
-use File::Basename;
-use Getopt::Long;
-################################################################################
-#
-# Constants
-#
-################################################################################
-use constant DATE		=> 'Tue May  8 22:21:39 2001';
-use constant ID			=> '$Id: mkmf,v 1.1 2003/03/28 13:41:00 pvdabeel Exp $';
-################################################################################
-#
-# Global Variables
-#
-################################################################################
-my %clo;
-my $object_extension;
-my $static_lib_extension;
-my $shared_lib_extension;
-my $static_lib_prefix;
-my $shared_lib_prefix;
-my $exec_extension;
-my $depend_flag;
-my ($ar, $arflags, $arextra);
-my ($sar, $sarflags);
-my @objects;
-my $rmf = "rm -f";
-my $source_ext_re = qr{\.(cxx|cc|cpp|c|c\+\+)$};
-my $dirsep = '/';
-
-if ($^O =~ /mswin/i) {
-    $dirsep = '\\';
-}
-
-if ($^O =~ /mswin/i) {
-    $rmf = "del /F /Q";
-}
-################################################################################
-#
-# Code Start
-#
-################################################################################
-GetOptions(
-    \%clo,
-    'help|h!',
-
-    'cxxflags=s',
-    'setid=s',
-    'developer!',
-    'include=s@',
-    'linkwith=s@',
-    'slinkwith=s@',
-    'many-exec!',
-    'one-exec=s',
-    'output|o=s',
-    'quiet!',
-    'static-lib=s',
-    'shared-lib=s',
-    'wrapper!',
-    'major=i',
-    'install=s',
-    'test-cmds=s',
-    'with-test:s',
-    'append=s@',
-    'clean-target=s@',
-    'clean-file=s@',
-    'fake-header=s@',
-    'mt!',
-) or usage();
-$clo{'help'} && usage();
-$clo{'linkwith'} ||= [];
-$clo{'include'} ||= [];
-$clo{'append'}	||= [];
-$clo{'clean-target'} ||= [];
-$clo{'clean-file'} ||= [];
-$clo{'fake-header'} ||= [];
-
-sub usage {
-    print "Usage: $0 <options> <source files>\n", <<EOT;
-  --help, -h             This message
-  --cxxflags path        Give path to the cxxflags script
-  --setid id             Use the given compiler id instead of checking
-
-  --developer            Add helpful stuff for a developer
-  --include path         Add include path to CXXFLAGS
-  --install spec         Add an install target using spec
-  --linkwith lib         Link executables with lib
-  --linkwith path,lib    Link executables with lib in path
-  --slinkwith lib        Static Link with lib
-  --slinkwith path,lib   Static Link with lib in path
-  --major num            Set major version for shared libraries
-  --mt                   Generate multithread safe code
-  --many-exec            Generate a Makefile for multiple executables
-  --one-exec basename    Generate a Makefile for one executable
-  --output, -o name      Name of file to generate [Default: Makefile]
-  --static-lib basename  Generate a Makefile for a static library
-  --shared-lib basename  Generate a Makefile for a shared library
-  --quiet                Be quiet
-  --wrapper              Generate a Makefile that calls other Makefile
-  --with-test            Generate a test target when using --wrapper
-                         you should give a comma seperated list of 
-			 directories to include in the wrap. Default to all.
-  --test-cmds            Add a test target that executes the given
-                         comma seperated list of commands
-  --append filename      Append the given file to the Makefile
-  --clean-target target  Add another target to the clean target
-  --clean-file filename  Remove the given file on a make clean
-  --fake-header filename Create a temp file for dependancies
-
-You must give a target type as well, target types are:
-  --one-exec
-  --many-exec
-  --static-lib
-  --shared-lib
-
-You can use --static-lib and --shared-lib at the same time.
-EOT
-    exit 1;
-}
-
-# set some defaults
-$clo{'output'}	    ||= 'Makefile';
-$clo{'cxxflags'}    ||= "..${dirsep}tools${dirsep}cxxflags";
-$clo{'cxxflags'}      = "'$clo{cxxflags}'";
-$clo{'major'}	    ||= '1';
-$ENV{'CXX'}	    ||= 'c++';
-$ENV{'CXXFLAGS'}    ||= '';
-$ENV{'LD'}	    ||= `$^X $clo{'cxxflags'} --linker`; chomp $ENV{'LD'};
-$ENV{'LDFLAGS'}	    ||= '';
-$ENV{'POST_LDFLAGS'}||= '';
-
-if ($clo{'setid'}) {
-    addflags($clo{'cxxflags'}, " --setid $clo{'setid'}");
-} else {
-    addflags($clo{'cxxflags'}, "--setid " . `$^X $clo{'cxxflags'} --getid`);
-}
-
-chomp($object_extension = `$^X $clo{'cxxflags'} --object-extension`);
-chomp($exec_extension = `$^X $clo{'cxxflags'} --exec-extension`);
-chomp($static_lib_extension = `$^X $clo{'cxxflags'} --static-lib-extension`);
-chomp($shared_lib_extension = `$^X $clo{'cxxflags'} --shared-lib-extension`);
-chomp($static_lib_prefix = `$^X $clo{'cxxflags'} --static-lib-prefix`);
-chomp($shared_lib_prefix = `$^X $clo{'cxxflags'} --shared-lib-prefix`);
-chomp($depend_flag = `$^X $clo{'cxxflags'} --depend`);
-chomp($ar = `$^X $clo{'cxxflags'} --ar`);
-chomp($arflags = `$^X $clo{'cxxflags'} --arflags`);
-chomp($arextra = `$^X $clo{'cxxflags'} --arextra`);
-chomp($sar = `$^X $clo{'cxxflags'} --sar`);
-chomp($sarflags = `$^X $clo{'cxxflags'} --sarflags`);
-
-clean($object_extension);
-clean($exec_extension);
-clean($static_lib_extension);
-clean($shared_lib_extension);
-clean($static_lib_prefix);
-clean($shared_lib_prefix);
-clean($depend_flag);
-clean($ar);
-clean($arflags);
-clean($arextra);
-clean($sar);
-clean($sarflags);
-
-if ($clo{'developer'}) {
-    addflags($ENV{'CXXFLAGS'}, `$^X $clo{'cxxflags'} --warn`);
-    addflags($ENV{'CXXFLAGS'}, `$^X $clo{'cxxflags'} --debug`);
-} else {
-    addflags($ENV{'CXXFLAGS'}, `$^X $clo{'cxxflags'} --optimize`);
-}
-
-if ($clo{'static-lib'} or $clo{'shared-lib'}) {
-    addflags($ENV{'CXXFLAGS'}, `$^X $clo{'cxxflags'} --pic`);
-}
-
-if ($clo{'mt'}) {
-    addflags($ENV{'CXXFLAGS'}, `$^X $clo{'cxxflags'} --mtcompile`);
-    addflags($ENV{'LDFLAGS'}, `$^X $clo{'cxxflags'} --mtlink`);
-}
-
-addflags($ENV{'CXXFLAGS'}, `$^X $clo{'cxxflags'} --general`);
-
-foreach (@{$clo{'slinkwith'}}) {
-    my ($lib, $path);
-
-    if (/,/) {
-	($path, $lib) = split(/,/, $_, 2);
-	$path .= $dirsep unless $path =~ /$dirsep$/;
-    } else {
-	$path = ".$dirsep";
-	$lib = $_;
-    }
-
-    $lib = $static_lib_prefix . $lib . $static_lib_extension;
-    addflags($ENV{'LDFLAGS'}, "'$path$lib'");
-}
-
-foreach (@{$clo{'linkwith'}}) {
-    addflags($ENV{'LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
-}
-
-foreach (@{$clo{'include'}}) {
-    addflags($ENV{'CXXFLAGS'}, "-I$_");
-}
-
-if (!$clo{'static-lib'} && !$clo{'shared-lib'} && !$clo{'many-exec'} && !$clo{'one-exec'} && !$clo{'wrapper'}) {
-    print STDERR "$0: missing target type type\n";
-    usage();
-}
-
-
-if (!$clo{'wrapper'}) {
-    my $x;
-    @objects = map{
-	($x=$_) =~ s/$source_ext_re/$object_extension/i; clean($x); $x
-    } @ARGV;
-}
-
-open(MF, ">$clo{'output'}") || die "$0: can't create $clo{'output'}: $!";
-
-print MF "# This Makefile automaticly generated by $0\n";
-print MF "# File created on: ", scalar localtime, "\n";
-print MF "# DO NOT EDIT THIS FILE!\n\n";
-
-if (!$clo{'wrapper'}) {
-    print MF "CXX=$ENV{CXX}\n";
-    print MF "CXXFLAGS=$ENV{CXXFLAGS}\n";
-    print MF "AR=$ar\n";
-    print MF "ARFLAGS=$arflags\n";
-    print MF "SAR=$sar\n";
-    print MF "SARFLAGS=$sarflags\n";
-    print MF "LD=$ENV{LD}\n";
-    print MF "LDFLAGS=$ENV{LDFLAGS}\n";
-    print MF "POST_LDFLAGS=$ENV{POST_LDFLAGS}\n";
-    print MF "OBJECTS=", join(' ', @objects), "\n";
-}
-
-if (!$clo{'quiet'}) {
-    print '+', '-' x 70, "\n";
-    print "|    -*- Compiler Settings -*-\n";
-    print "|\n";
-    print "|      CXX = $ENV{CXX}\n";
-    print "| CXXFLAGS = $ENV{CXXFLAGS}\n";
-    print "|       AR = $ar\n";
-    print "|  ARFLAGS = $arflags\n";
-    print "|      SAR = $sar\n";
-    print "| SARFLAGS = $sarflags\n";
-    print "|       LD = $ENV{LD}\n";
-    print "|  LDFLAGS = $ENV{LDFLAGS}\n";
-    print '+', '-' x 70, "\n";
-}
-
-if ($clo{'one-exec'}) {
-    my $target = $clo{'one-exec'} . $exec_extension;
-    my $mkexec; chomp($mkexec = `$^X $clo{'cxxflags'} --mkexec $target`);
-    print MF "TARGETS=$target\n";
-    print MF "\n";
-
-    print MF "all: \$(TARGETS)\n";
-    print MF "\n";
-
-    print MF "$target: \$(OBJECTS)\n";
-    print MF "\t\$(LD) $mkexec \$(OBJECTS) \$(LDFLAGS) \$(POST_LDFLAGS)\n";
-} elsif ($clo{'many-exec'}) {
-    my $x;
-
-    my @targets = map{
-	($x=$_) =~ s/$source_ext_re/$exec_extension/i; clean($x); $x
-    } @ARGV;
-
-    print MF "TARGETS=", join(' ', @targets), "\n";
-    print MF "\n";
-
-    print MF "all: \$(TARGETS)\n";
-    print MF "\n";
-
-    foreach my $src (@ARGV) {
-	my $exec = $src; $exec =~ s/$source_ext_re/$exec_extension/i;
-	my $obj = $src;  $obj  =~ s/$source_ext_re/$object_extension/i;
-	my $mkexec; chomp($mkexec = `$^X $clo{'cxxflags'} --mkexec $exec`);
-
-	print MF "$exec: $obj\n";
-	print MF "\t\$(LD) $mkexec $obj \$(LDFLAGS) \$(POST_LDFLAGS)\n";
-	print MF "\n";
-    }
-} elsif ($clo{'static-lib'} or $clo{'shared-lib'}) {
-	my $static_target = $static_lib_prefix . $clo{'static-lib'} . $static_lib_extension;
-	my $shared_target = $shared_lib_prefix . $clo{'shared-lib'} . $shared_lib_extension;
-	my $targets = '';
-
-	my $static_lib = `$^X $clo{'cxxflags'} --mkstatic $static_target`;
-	chomp($static_lib); clean($static_lib);
-
-	my $shared_lib = `$^X $clo{'cxxflags'} --major $clo{'major'} --mkshared $shared_target`;
-	chomp($shared_lib); clean($shared_lib);
-
-	$targets .= "$static_target " if $clo{'static-lib'};
-	$targets .= "$shared_target " if $clo{'shared-lib'};
-
-	print MF "TARGETS=$targets\n\n";
-	print MF "all: \$(TARGETS)\n\n";
-
-    if ($clo{'static-lib'}) {
-	print MF "$static_target: \$(OBJECTS)\n";
-	print MF "\t\$(AR) \$(ARFLAGS) $static_lib \$(OBJECTS)\n";
-	print MF "\t$arextra $static_lib\n" if length($arextra);
-	print MF "\n";
-    }
-
-    if ($clo{'shared-lib'}) {
-	print MF "$shared_target: \$(OBJECTS)\n";
-	print MF "\t\$(SAR) \$(SARFLAGS) $shared_lib \$(OBJECTS) \$(POST_LDFLAGS)\n";
-	print MF "\n";
-    }
-} elsif ($clo{'wrapper'}) {
-    $clo{'with-test'} ||= join(',', @ARGV);
-
-    print MF "\n";
-
-    print MF "all:\n";
-    foreach my $dir (@ARGV) {
-	print MF "\t\@(cd $dir; \${MAKE})\n";
-    }
-    print MF "\n";
-
-    print MF "clean: ", join(' ', @{$clo{'clean-target'}}), "\n";
-    print MF "\t- $rmf ", join(' ', @{$clo{'clean-file'}}), "\n" if @{$clo{'clean-file'}};
-    foreach my $dir (@ARGV) {
-	print MF "\t\@(cd $dir; \${MAKE} clean)\n";
-    }
-    print MF "\n";
-
-    print MF "realclean:\n";
-    foreach my $dir (@ARGV) {
-	print MF "\t\@(cd $dir; \${MAKE} realclean)\n";
-    }
-    print MF "\trm -f $clo{'output'}\n";
-    print MF "\n";
-
-    if ($clo{'with-test'}) {
-	print MF "test:\n";
-	foreach my $dir (split(/\s*,\s*/, $clo{'with-test'})) {
-	    print MF "\t\@(cd $dir; \${MAKE} test)\n";
-	}
-	print MF "\n";
-    }
-
-}
-
-if ($clo{'test-cmds'}) {
-    print MF "test: \${TARGETS}\n";
-    print MF "\t$_\n" foreach (split(/\s*,\s*/, $clo{'test-cmds'}));
-    print MF "\n";
-}
-	
-if ($depend_flag && $clo{'developer'} && !$clo{'wrapper'}) {
-    my @to_unlink;
-
-    foreach my $fake_header (@{$clo{'fake-header'}}) {
-	if (-e $fake_header) {
-	    print STDERR "$0: $fake_header already exists\n";
-	    next;
-	}
-
-	unless (open(FH, ">$fake_header")) {
-	    print STDERR "$0: could not create $fake_header: $!\n";
-	    next;
-	}
-
-	print FH "/* fake header */\n";
-	close FH;
-	push(@to_unlink, $fake_header);
-    }
-
-    foreach (@ARGV) {
-	print "  ===> Generating Dependancy Information for $_\n"
-	    unless $clo{'quiet'};
-
-	print MF `$ENV{'CXX'} $ENV{'CXXFLAGS'} $depend_flag $_`;
-	print MF "\n";
-    }
-
-    unlink(@to_unlink);
-}
-
-if (!$clo{'wrapper'}) {
-    print MF "clean: ", join(' ', @{$clo{'clean-target'}}), "\n";
-    print MF "\t- $rmf \$(OBJECTS) \$(TARGETS) *.core core ", join(' ', @{$clo{'clean-file'}}), "\n";
-    print MF "\t- rm -rf SunWS_cache ir.out\n" if $^O eq 'solaris';
-    print MF "\n";
-
-    print MF "realclean: clean\n";
-    print MF "\t- $rmf $clo{'output'}\n";
-    print MF "\n";
-
-    print MF ".SUFFIXES: .cxx\n";
-    print MF ".SUFFIXES: .obj\n";
-    print MF "\n";
-
-    print MF ".cxx.o:\n";
-
-    if ($^O eq 'solaris' and $clo{'many-exec'}) {
-	print MF "\t\@if test -d SunWS_cache ; then rm -rf SunWS_cache; fi\n";
-    }
-
-    print MF "\t\$(CXX) \$(CXXFLAGS) -c \$<\n";
-    print MF "\n";
-
-    print MF ".cxx.obj:\n";
-
-    if ($^O eq 'solaris' and $clo{'many-exec'}) {
-	print MF "\t\@if test -d SunWS_cache ; then rm -rf SunWS_cache; fi\n";
-    }
-
-    print MF "\t\$(CXX) \$(CXXFLAGS) -c \$<\n";
-    print MF "\n";
-}
-
-
-if ($clo{'install'} and $^O !~ /mswin/) {
-    unless (open(SPEC, $clo{'install'})) {
-	print STDERR "$0: can't open install spec file $clo{'install'}: $!\n";
-	exit 1;
-    }
-
-    my %vars = (
-	'BINDIR'	=> '/usr/local/bin',
-	'INCLUDEDIR'	=> '/usr/local/include',
-	'LIBDIR'	=> '/usr/local/lib',
-	'MANDIR'	=> '/usr/local/share/man',
-    );
-
-    my @binaries;
-    my @include_files;
-    my @include_dirs;
-    my @static_libraries;
-    my @shared_libraries;
-    my @man_pages;
-
-    while (<SPEC>) {
-	chomp; s/^\s+//g; s/\s+$//g;
-	next if /^$/ or /^#/;
-
-	if (/^\w+\s*=/) {
-	    my ($key, $value) = split(/\s*=\s*/, $_, 2);
-	    $key = uc $key;
-
-	    if (!exists $vars{$key}) {
-		print STDERR "$0: warning, $key is not a valid variable.\n";
-		print STDERR "$0: from $clo{'install'}:$.\n";
-		next;
-	    }
-
-	    $vars{$key} = $value;
-	} elsif (/^include-dir\s+([^\s]+)\s+([^\s]+)$/) {
-	    if (! -d $1) {
-		print STDERR "$0: warning, $1 is not a directory.\n";
-		print STDERR "$0: from $clo{'install'}:$.\n";
-		next;
-	    }
-
-	    push(@include_dirs, [$1, $2]);
-	} elsif (/^include-files?\s+([^\s]+)$/) {
-	    my @files = glob($1);
-
-	    if (!@files) {
-		print STDERR "$0: glob did not match any files\n";
-		print STDERR "$0: from $clo{'install'}:$.\n";
-		next;
-	    }
-
-	    my @names = map{s(^.*/)()} @files;
-
-	    for (my $i=0; $i<@files; ++$i) {
-		push(@include_files, [$files[$i], $names[$i]]);
-	    }
-	} elsif (/^binary\s+([^\s]+)$/) {
-	    my ($full, $base) = ($1, $1);
-	    $base =~ s(^.*/)();
-
-	    push(@binaries, [$full, $base]);
-	} elsif (/^(static-lib|shared-lib)\s+([^\s]+)\s+([^\s]+)\s*(\d+)?$/) {
-	    if (! -d $2) {
-		print STDERR "$0: first option to $1 should be a directory.\n";
-		print STDERR "$0: $2 is not a directory.\n";
-		print STDERR "$0: from $clo{'install'}:$.\n";
-		next;
-	    }
-
-	    if ($1 eq 'static-lib') {
-		push(@static_libraries, [$2, $3]);
-	    } elsif ($1 eq 'shared-lib') {
-		my $major = $4 || 1;
-		push(@shared_libraries, [$2, $3, $major]);
-	    }
-	} elsif (/^man\s+(\d+)\s+(.+)$/) {
-	    if (! -e $2) {
-		print STDERR "$0: man page not found: $2\n";
-		next;
-	    }
-
-	    push(@man_pages, [$1, $2]);
-	} else {
-	    print STDERR "$0: I don't understand this line.\n";
-	    print STDERR "$0: $_\n";
-	    print STDERR "$0: from $clo{'install'}:$.\n";
-	    next;
-	}
-    }
-
-    if (@static_libraries or @shared_libraries or @binaries or @include_dirs or @include_files or @man_pages) {
-	print MF "install: all\n";
-	print MF "\tinstall -d $vars{'BINDIR'}\n" if @binaries;
-	print MF "\tinstall -d $vars{'INCLUDEDIR'}\n" if @include_files or @include_dirs;
-	print MF "\tinstall -d $vars{'LIBDIR'}\n" if @static_libraries or @shared_libraries;
-	print MF "\tinstall -d $vars{'MANDIR'}\n" if @man_pages;
-
-	foreach my $binary (@binaries) {
-	    print MF "\tinstall -m0755 $binary->[0] $vars{'BINDIR'}/$binary->[1]\n";
-	}
-
-	foreach my $directory (@include_dirs) {
-	    print MF "\tinstall -d $vars{'INCLUDEDIR'}/$directory->[1]\n";
-	    print MF "\tinstall -m0755 $directory->[0]/* $vars{'INCLUDEDIR'}/$directory->[1]\n";
-	}
-
-	foreach my $file (@include_files) {
-	    print MF "\tinstall -m0644 $file->[0] $vars{'INCLUDEDIR'}/$file->[1]\n";
-	}
-
-	foreach my $library (@static_libraries) {
-	    my $libname = "$static_lib_prefix$library->[1]$static_lib_extension";
-	    print MF "\tinstall -m0755 $library->[0]/$libname $vars{'LIBDIR'}/$libname\n";
-	}
-
-	foreach my $library (@shared_libraries) {
-	    my $libname = "$shared_lib_prefix$library->[1]$shared_lib_extension";
-	    my $major_name = `$^X $clo{'cxxflags'} --major $library->[2] --mkshared-name $library->[1]`;
-
-	    chomp($major_name); clean($major_name);
-
-	    print MF "\tinstall -m0755 $library->[0]/$libname $vars{'LIBDIR'}/$major_name\n";
-	    print MF "\trm -f $vars{'LIBDIR'}/$libname\n";                  ## this probably breaks sandbox... hmmzz
-	    print MF "\t(cd $vars{'LIBDIR'}; ln -s $major_name $libname)\n";
-	}
-
-	foreach my $manpage (@man_pages) {
-	    my $file = basename($manpage->[1]);
-
-	    print MF "\tinstall -d $vars{'MANDIR'}/man$manpage->[0]\n";
-	    print MF "\tinstall -m0644 $manpage->[1] $vars{'MANDIR'}/man$manpage->[0]\n";
-	}
-
-	print MF "\n";
-    }
-}
-
-foreach my $append (@{$clo{'append'}}) {
-    unless (open(AP, $append)) {
-	print STDERR "$0: can't open '$append' so that I could append it to the Makefile\n";
-	exit 1;
-    }
-
-    print MF "\n";
-    while (<AP>) { print MF; }
-    close AP;
-}
-
-close MF;
-
-sub addflags {
-    clean($_[0]); clean($_[1]);
-    chomp($_[0] .= ' ' . $_[1]);
-    clean($_[0]);
-}
-
-sub clean {
-    $_[0] =~ s/^\s+//; $_[0] =~ s/\s+$//;
-}
diff --git a/dev-libs/xmlwrapp/files/gentoo-0.4.0.patch b/dev-libs/xmlwrapp/files/xmlwrapp-gentoo.diff
index 31f0315eef0f..31f0315eef0f 100644
--- a/dev-libs/xmlwrapp/files/gentoo-0.4.0.patch
+++ b/dev-libs/xmlwrapp/files/xmlwrapp-gentoo.diff
diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
new file mode 100644
index 000000000000..06689a1a9114
--- /dev/null
+++ b/dev-libs/xmlwrapp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>text-markup</herd>
+</pkgmetadata>
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild
index 6560f53e1a9c..b4e49daf4059 100644
--- a/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild,v 1.4 2003/07/14 21:28:13 pvdabeel Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild,v 1.5 2004/02/21 11:40:12 usata Exp $
 
 DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-SRC_URI="http://pmade.org/pjones/software/xmlwrapp/download/${P}.tar.gz"
-HOMEPAGE="http://pmade.org/pjones/software/xmlwrapp/"
+SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
+HOMEPAGE="http://pmade.org/software/xmlwrapp/"
 
 KEYWORDS="x86 ppc"
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 
 DEPEND="virtual/glibc
@@ -20,7 +18,7 @@ DEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/gentoo-${PV}.patch
+	epatch ${FILESDIR}/${PN}-gentoo.diff
 	perl configure.pl --prefix /usr
 	mv xmlwrapp-config xmlwrapp-config.bak
 	perl configure.pl --prefix ${D}/usr
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild
index a3478a9c9827..3f618dae6233 100644
--- a/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild,v 1.1 2003/07/14 21:28:13 pvdabeel Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild,v 1.2 2004/02/21 11:40:12 usata Exp $
 
 DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-SRC_URI="http://pmade.org/pjones/software/xmlwrapp/download/${P}.tar.gz"
-HOMEPAGE="http://pmade.org/pjones/software/xmlwrapp/"
+SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
+HOMEPAGE="http://pmade.org/software/xmlwrapp/"
 
 KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 
 DEPEND="virtual/glibc
@@ -20,7 +18,7 @@ DEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/gentoo-${PV}.patch
+	epatch ${FILESDIR}/${PN}-gentoo.diff
 	perl configure.pl --prefix /usr
 	mv xmlwrapp-config xmlwrapp-config.bak
 	perl configure.pl --prefix ${D}/usr
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild
new file mode 100644
index 000000000000..1bc6e06091e2
--- /dev/null
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild,v 1.1 2004/02/21 11:40:12 usata Exp $
+
+DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
+SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
+HOMEPAGE="http://pmade.org/software/xmlwrapp/"
+
+KEYWORDS="~x86 ~ppc"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="virtual/glibc
+	dev-lang/perl
+	dev-libs/libxml2
+	dev-libs/libxslt"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gentoo.diff
+}
+
+src_compile() {
+
+	perl configure.pl --prefix /usr || die
+	emake || die
+}
+
+src_install() {
+
+	sed -i "s%/usr%${D}/usr%g" Makefile
+	make install || die
+
+	dodoc README docs/{CREDITS,TODO,VERSION}
+	cd docs
+	for doc in {manual,project} ; do
+		insinto /usr/share/doc/${PF}/$doc
+		doins $doc/*.xml
+	done
+}