Version bump. Fix automake-1.12 problems with a proper patch.

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

5 files changed, 488 insertions, 6 deletions

diff --git a/dev-libs/libreport/ChangeLog b/dev-libs/libreport/ChangeLog
index f63a7857b73a..d4c448881348 100644
--- a/dev-libs/libreport/ChangeLog
+++ b/dev-libs/libreport/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libreport
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.12 2012/07/08 17:19:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/ChangeLog,v 1.13 2012/09/22 20:12:48 tetromino Exp $
+
+*libreport-2.0.13 (22 Sep 2012)
+
+  22 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libreport-2.0.13.ebuild, +files/libreport-2.0.13-automake-1.12.patch,
+  +files/libreport-2.0.13-gentoo.patch:
+  Version bump. Fix automake-1.12 problems with a proper patch.
 
   08 Jul 2012; Justin Lecher <jlec@gentoo.org> libreport-2.0.10.ebuild:
   Add fix for automake-1.12, #425268
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 77e6be4e1c55..75a3cffa9e3c 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libreport-2.0.13-automake-1.12.patch 2285 SHA256 b4c764e104cf76336661d96228786ce2d347ca6339e44c85a993c3c10fc0a215 SHA512 59a6f857604ab45c049030ab351cef28dc51b78aabd5575ff45abdd607d6b973020f32687666fd11a879e0ee18aca75650fa9e3fa2284a8e05c6b65216479b9f WHIRLPOOL 660303844f839d8d7f494d22f041d4543b502074603183801def34741f7a3e5fddb06a54d0b8372c49e508ca1076b1c81063e36c426134f0903efb642b17cb4c
+AUX libreport-2.0.13-gentoo.patch 10369 SHA256 7dec2b0708121c5deb5e8036d9ef5ee20aebd9713ee191d701b27920a4ab0f49 SHA512 762e389c62efaeaad08a04871e5dec05aadc26fb9457291bf2308835128241068b2e799585060b3ce4f7bd17f275a4e5c7da37835d4e8940651ea5e5928402f0 WHIRLPOOL 0b253ba384ee40aa60c36564739101e328e326fcf5e3543644ed46b71a89fbb34d8567ce5892a162ba7b26f6bc780514601e6fc32f883f3276c7a1229529ac92
 AUX libreport-2.0.7-gentoo.patch 5415 SHA256 b2368cfb101f085faa639417f828ec25e7b47e0b10cb96501680d1bf36b3e5d3 SHA512 7729c398859a06dc90f8e69b37472b8f25ba5be1b699baa5f2acef64b18ff5b6822c481e71f55e2bcdbc7a22208c380f996f1dccd1bcb7b8a52ddde6163a5ea4 WHIRLPOOL f3952c37612bc2571831d33337811d0d2f95ebdca1ad3f990c8bd08cc6b1920544e0b93e2d0bbadee0387e429234bbbb0292da59dd795bfc26a2f73dda20f7bf
 AUX libreport-2.0.7-multiple-tabs.patch 1485 SHA256 263f07946f0f6dd9d6490dfe12f583cc997f435437c5af3b3db9e94da63f201f SHA512 9565ab7bdf774c28c2b31ddd9f2b812dd3c116b005a6da9545028b1a93def074cfa6a920e822cc5ed49092e04731caa82b9d89edeeb8fb8c5350e434ae32954a WHIRLPOOL 55b66e4ff80a521c68284e7527d86629e3f42249dc0d1d1cb8a728e277464a1d2493bb4e960e65cf2c443c90a02307b32ec9886ccb1be1121f6053a2ffb8043d
 AUX libreport-2.0.7-no-bugzilla.patch 2210 SHA256 7d5bec81f206b1734dd5852e73e04056b2eb51cf7a739a36835aa76c9b803d48 SHA512 5c90f3511e7b91b5eeb70598e4583fd7e3bc3ed0491f0f4c62756917bfa6aa75100775289c615e526c31b3fce57fd013a0726f50fac9715945532b3d563a51d4 WHIRLPOOL b940a7a218e5ac2183a9de5a969e4e46b119ba642fcf77feeb0ba0d096ebb579c6a8179e447d14aac80a9689b782eb1d7db7a32344a5d5a43ee45b41957f7cfe
@@ -8,16 +10,21 @@ AUX libreport-2.0.7-uploader_event-syntax.patch 610 SHA256 b93e9e05396b70754fcac
 AUX libreport-2.0.9-gentoo.patch 8795 SHA256 f3d0ee0e1c9f6032ce71d6daa92d8796306d9bfd91a346fb0c874f49368807ea SHA512 308ca2d73deadd351ff188941b37ce4d01c3b9d395038fa58b4bd03bd418659942d4def77c2423976f0113160642e92a9c55e7826e30ed2afe8c47116c7658ce WHIRLPOOL ba7891e9859de7cf8927da24080153c4e1c7f8df8762e27fc9d6d12e5dd5b0e0801511af341739000db41b3c6f39e775edd419ee1bbb0cff8e4e2dd54fd57907
 AUX libreport-2.0.9-no-bugzilla.patch 2620 SHA256 794b862cdd8d3d946eb80558cd7531f01a18944a2fa11be2fb9f585d397c4f05 SHA512 3d00eaa2aca33295af7331a0ebde312506edce6b8df5efe26ca190e9c431b6d5c6b9055c7dfbd5be923e39315f3b23a766b3ee2e46dea2d379839933467c348f WHIRLPOOL 46d3a99a8880ccbd9247a49903adbfc3e94a127253d5c0267a14da86f8023cae04dea9ef79f9a1ca23a2b02166415097931bf61343729c5386a5dd796f5fcbbd
 DIST libreport-2.0.10.tar.gz 1204194 SHA256 ab8f2bb2eeb93719b6a946b8a810527cec653815fd59c3fb03efca88e6e80408 SHA512 f9eca6aacb28c856e5bc109545dbd371baf57de4f2431b988dfce0d9d1a1e38269a056a924453bbfaed7c80890ddddbddca086754385a7397e23b6d1b8a17702 WHIRLPOOL 2429cd98c9d897a953956d92a9680fd65ccaf79f89da84c0862356c11acf318a50b41a674ac4de07e020836a2e4efcd38f1d949e2136a2abb854324a2c9a2a5a
+DIST libreport-2.0.13.tar.gz 1190147 SHA256 4a0609abe80b9432ae81c5a512680a7035b547cd1fef29c63c730d92c1be8b05 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181 WHIRLPOOL 647da27bf88cf77dbb25ace9f446dfe9a875370c27fef05999843dcee1f653ba07af44d4e5a36107dbf69f0241f1f66d3a6a58ae7897faca7b049d2b1aa00301
 DIST libreport-2.0.9.tar.gz 1088917 SHA256 c63f259838d75c42f7557fe00b57beef7e889723864d35c89a003c81a8722e3d SHA512 38a3b1b7e5f8938a359a83b1a74087711fc369dc990c4a9727587473bd86aee297734fb0fdf30cc39e937f2ed03fb3697926d4fb7780dc82313f70a24d5d535b WHIRLPOOL cf16faccb5e6a02f3b38031433f17a2c8506f9fbcff9892c228459334f3afb2b6e4d107652a97fd24688f766c29b5d05e911d5fa47910f90ede49fa230bc6ab6
 EBUILD libreport-2.0.10.ebuild 3085 SHA256 96d731670bc6f82a87c07e8ccc4c9caf026eeea0b8fa258e7ae4fbf34b709106 SHA512 15f4d37473dfba0132efe3f4f9462edecad1d9b69804712415dd8d9279fe1d05a7bf9088b27c21f8b138a924092eeab86ec835102d939f1aa7a94f2f6e860500 WHIRLPOOL f9a76e1cbb78bb23ea9c210b6f70aeb890e456a8d9a570324955ed59c67db930caf3b8d8fc5017128f96f229e4960a6933ce5d35bc590d7f506998e01a5aaeb6
+EBUILD libreport-2.0.13.ebuild 2117 SHA256 48c35aa6675220b95f279ee57a0d8b51667d1eb457bec433d4687f9edafda93d SHA512 16c664eaba29598289819fc4314c09b1810da22dc1c7521d42479449171d8379b95926d16ea339a41f12a46e6e6776c85e6391a3336d9688087495071082a01e WHIRLPOOL 0974343204be88f96e10861a26ecdfe18274c55c946370ba3a5798e1e8af26f4724e6974b673349dfc34e5ee2fe24dd433fec6abe02910544f1e9782eb0f64a3
 EBUILD libreport-2.0.9.ebuild 2810 SHA256 d3b6148bdabd5d505934703ff671eee20f5f4b2ca2fc9d4b39f220d7cc41d9a1 SHA512 a5ff075c802a82d3c875f6ab56e8d9b03cc3a21fc9be13d6a817877b913dcffb22d6bb3a30589190b63c2ee2d3ac271d5452133136119e71fb8d507897d80809 WHIRLPOOL b81bec3eb7b2772f8581e1e3954d83ef089552047c16bd0b67dcbfe3d1699311b2c793793541dcbfa050b582668ef3a4f3a3011afb9677f8cc84d912e5284683
-MISC ChangeLog 2096 SHA256 12f023245811d0cc9ee72feb2ae6e9ecb81f8f267519199dced613fb0df99154 SHA512 27870e2ab40fe19740e2fbe1dae90ebb4cc9a085e7eff5769cb528a7c539237234cc4a8e35ad8b4d7499406378b75d25312603876678ea98b93a8f87b611b011 WHIRLPOOL 5ff37a54d2350c99b14faecd4ab13aaa6ca93eaecc1589addfe4992dd2c08d062d6578294482d795830d1b2b2918430a0c6c91aa6f3853fdf297d5821630dbe2
+MISC ChangeLog 2371 SHA256 4a340903a11b65210180d14d3387b4d17835b88a7bedf49c7bf58bb956214372 SHA512 e1d4e0ede43047ca993ce0e632fe8fd288122b9ba48f31bb82a94b8f23ea5d32aad07fe61c75b6a89220eb901deaa5af6efc577711afd98bee1733310fd0e085 WHIRLPOOL 2c972f968094a83516a2b562c667747419958cd8674209f8edb3c6ab9d273d84c2949da08e3a8799c3b1e2f3cff88788f6a71c36b6dc63bf210090b5f1670411
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAk/5wSwACgkQgAnW8HDreRZKzgCfcAuBng1j4zSijB4lp+q5rEQk
-baQAn2aatc72iU68AAE10df1skXERDic
-=nccz
+iQEcBAEBCAAGBQJQXhvFAAoJEJ0WA1zPCt1h0+oH/0JoSAhdYV6VI5dQhjvamqsn
+mAkxuAotmxiPce+qr3w5rKeswirUsfO7Yw8DJiZ9N9KbgISRo9Qxj4qVa8gJM09G
+37qW81NBg3chunFKp2uSOO0nj4xGrwVTQ5K1DRKQaHoG9xzxABkSl47yVD++ouUs
+ieabIk+EsHxCjmdQfQR7a+1PsIDlS2/7wA50m0zgAKjqg1747IM8ewU8v2f3N+50
+t9JZccipwXuX2JvEAfsfnRLAm1B/tXwAdGZ3esT3obBqyuxRWr5IZ0DADvsWy1uh
+lncmuZDk5DPSmZASlicx/Dq0MmpWoSIVgZLN4tB6fQvcu1TGAUKZPNF6Z0cU/XY=
+=6Zyr
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch b/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch
new file mode 100644
index 000000000000..4baaedd4d8eb
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch
@@ -0,0 +1,80 @@
+From cb7d7fe5b2daf4dac3b8a1616461a0c840e18b73 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 03:06:03 -0400
+Subject: [PATCH] Fix automake-1.12 autoreconf issues.
+
+Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am
+
+Need AM_PROG_CC_C_O for src/cli/cli.c
+
+gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
+problems for automake-1.12.
+---
+ configure.ac            | 8 +++-----
+ src/lib/Makefile.am     | 2 +-
+ src/plugins/Makefile.am | 2 +-
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dd50bcf..3955689 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT([libreport],
+ 	[crash-catcher@fedorahosted.org])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
+ # Support silent build rules. Disable by either passing --disable-silent-rules
+ # to ./configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+@@ -11,8 +11,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+ AM_SILENT_RULES([yes])
+ 
+ AC_DISABLE_STATIC
++AM_PROG_AR
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_LN_S
+ 
+ AC_SYS_LARGEFILE
+@@ -33,9 +34,6 @@ GETTEXT_PACKAGE=libreport
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ dnl ****** END ****************************************
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5befe7d..2c51931 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -121,7 +121,7 @@ libreport_web_la_LIBADD = \
+     libreport.la
+ 
+ $(DESTDIR)/$(DEBUG_DUMPS_DIR):
+-	$(mkdir_p) '$@'
++	$(MKDIR_P) '$@'
+ # no need to chmod it here
+ #chmod 1777 '$@'
+ install-data-local: $(DESTDIR)/$(DEBUG_DUMPS_DIR)
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 3f9dfd7..795d198 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -40,7 +40,7 @@ EXTRA_DIST = \
+     report_Uploader.xml.in
+ 
+ $(DESTDIR)/$(DEBUG_INFO_DIR):
+-	$(mkdir_p) '$@'
++	$(MKDIR_P) '$@'
+ 
+ reporter_upload_SOURCES = \
+     reporter-upload.c
+-- 
+1.7.12
+
diff --git a/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch b/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch
new file mode 100644
index 000000000000..89c6a17354a3
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch
@@ -0,0 +1,295 @@
+From 624d523361dcf8c10742cbcb1a017e21675002ff Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 02:17:08 -0400
+Subject: [PATCH] Replace Fedora defaults with Gentoo ones, and disable code
+ not relevant for Gentoo
+
+Disable bugzilla and ureport plugins (they require Gentoo infrastructure
+changes). Fix libreport-web.pc to not rely on xmlrpc.pc, which Gentoo
+does not have.
+
+Disble mailx post-create by default to avoid "abrtd: 'post-create' ...
+exited with 141" errors.
+---
+ doc/Makefile.am                    |  2 -
+ doc/reporter-bugzilla.txt          |  2 +-
+ libreport-web.pc.in                |  6 +--
+ src/lib/dump_dir.c                 |  2 +-
+ src/plugins/Makefile.am            | 83 ++------------------------------------
+ src/plugins/bugzilla.conf          |  2 +-
+ src/plugins/mailx_event.conf       |  2 +-
+ src/plugins/report_Bugzilla.conf   |  2 +-
+ src/plugins/report_Bugzilla.xml.in |  4 +-
+ src/plugins/reporter-bugzilla.c    |  2 +-
+ src/report-python/__init__.py      |  4 +-
+ 11 files changed, 16 insertions(+), 95 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 542fe4c..863b6d1 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -9,11 +9,9 @@ XMLTO_SILENT_0 = @echo "  XMLTO " $@;
+ 
+ MAN1_TXT =
+ MAN1_TXT += report-cli.txt
+-MAN1_TXT += reporter-bugzilla.txt
+ MAN1_TXT += reporter-kerneloops.txt
+ MAN1_TXT += reporter-mailx.txt
+ MAN1_TXT += reporter-print.txt
+-MAN1_TXT += reporter-rhtsupport.txt
+ MAN1_TXT += reporter-upload.txt
+ MAN1_TXT += report.txt
+ 
+diff --git a/doc/reporter-bugzilla.txt b/doc/reporter-bugzilla.txt
+index 3cedf73..734d598 100644
+--- a/doc/reporter-bugzilla.txt
++++ b/doc/reporter-bugzilla.txt
+@@ -44,7 +44,7 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
+ 	Password to Bugzilla account.
+ 
+ 'BugzillaURL'::
+-	Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com)
++	Bugzilla HTTP(S) address. (default: https://bugs.gentoo.org/)
+ 
+ 'SSLVerify'::
+ 	Use yes/true/on/1 to verify server's SSL certificate. (default: yes)
+diff --git a/libreport-web.pc.in b/libreport-web.pc.in
+index c9af1d2..14505f8 100644
+--- a/libreport-web.pc.in
++++ b/libreport-web.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: libreport
+ Description: Library providing network API for libreport
+ Version: @VERSION@
+-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json btparser libreport
+-Libs: -L${libdir} -lreport-web
+-Cflags:
++Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 json btparser libreport
++Libs: -L${libdir} @XMLRPC_LIBS@ @XMLRPC_CLIENT_LIBS@ -lreport-web
++Cflags: @XMLRPC_CFLAGS@ @XMLRPC_CLIENT_CFLAGS@
+ 
+diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
+index 0fc7da7..41e4f55 100644
+--- a/src/lib/dump_dir.c
++++ b/src/lib/dump_dir.c
+@@ -556,7 +556,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid, const char *chroot_di
+         release = load_text_file("/etc/system-release",
+                 DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
+         if (!release)
+-            release = load_text_file("/etc/redhat-release", /*flags:*/ 0);
++            release = load_text_file("/etc/gentoo-release", /*flags:*/ 0);
+         dd_save_text(dd, FILENAME_OS_RELEASE, release);
+         if (chroot_dir)
+         {
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 967596f..3f9dfd7 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -1,36 +1,27 @@
+ pluginslibdir = $(PLUGINS_LIB_DIR)
+ 
+ bin_PROGRAMS = \
+-    reporter-bugzilla \
+-    reporter-rhtsupport \
+     reporter-kerneloops \
+     reporter-upload \
+     reporter-mailx \
+     reporter-print \
+-    report \
+-    reporter-ureport
++    report
+ 
+ pluginsconfdir = $(PLUGINS_CONF_DIR)
+ 
+ reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
+ 
+ dist_reportpluginsconf_DATA = \
+-    bugzilla.conf \
+-    rhtsupport.conf \
+     mailx.conf
+ 
+ eventsdir = $(EVENTS_DIR)
+ 
+ dist_events_DATA = \
+-    report_Bugzilla.xml \
+-    report_Bugzilla.conf \
+     report_Logger.conf \
+     report_Logger.xml \
+     report_Mailx.xml \
+-    report_RHTSupport.xml \
+     report_Kerneloops.xml \
+-    report_Uploader.xml \
+-    report_uReport.xml
++    report_Uploader.xml
+ 
+ @INTLTOOL_XML_RULE@
+ 
+@@ -39,74 +30,18 @@ eventsconfdir = $(EVENTS_CONF_DIR)
+ dist_eventsconf_DATA = \
+     mailx_event.conf \
+     print_event.conf \
+-    bugzilla_event.conf \
+-    rhtsupport_event.conf \
+     uploader_event.conf
+ 
+ EXTRA_DIST = \
+-    report_Bugzilla.xml.in \
+-    report_Bugzilla.conf \
+     report_Logger.conf \
+     report_Logger.xml.in \
+     report_Mailx.xml.in \
+-    report_RHTSupport.xml.in \
+     report_Kerneloops.xml.in \
+-    report_Uploader.xml.in \
+-    report_uReport.xml.in
++    report_Uploader.xml.in
+ 
+ $(DESTDIR)/$(DEBUG_INFO_DIR):
+ 	$(mkdir_p) '$@'
+ 
+-reporter_bugzilla_SOURCES = \
+-    reporter-bugzilla.c rhbz.c rhbz.h
+-reporter_bugzilla_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DBIN_DIR=\"$(bindir)\" \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    -DLOCALSTATEDIR='"$(localstatedir)"' \
+-    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+-    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
+-    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+-    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_bugzilla_LDADD = \
+-    $(GLIB_LIBS) \
+-    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
+-    ../lib/libreport-web.la \
+-    ../lib/libreport.la
+-
+-reporter_rhtsupport_SOURCES = \
+-    abrt_rh_support.h abrt_rh_support.c \
+-    reporter-rhtsupport.h \
+-    reporter-rhtsupport-parse.c \
+-    reporter-rhtsupport.c
+-reporter_rhtsupport_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DBIN_DIR=\"$(bindir)\" \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    -DLOCALSTATEDIR='"$(localstatedir)"' \
+-    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+-    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
+-    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+-    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
+-    $(LIBXML_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_rhtsupport_LDFLAGS = -ltar
+-reporter_rhtsupport_LDADD = \
+-    $(GLIB_LIBS) \
+-    $(LIBXML_LIBS) \
+-    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
+-    ../lib/libreport-web.la \
+-    ../lib/libreport.la
+-
+ reporter_upload_SOURCES = \
+     reporter-upload.c
+ reporter_upload_CPPFLAGS = \
+@@ -200,16 +135,4 @@ report_CPPFLAGS = \
+ report_LDADD = \
+     ../lib/libreport.la
+ 
+-reporter_ureport_SOURCES = \
+-    ureport.c
+-reporter_ureport_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_ureport_LDADD = \
+-    ../lib/libreport.la \
+-    ../lib/libreport-web.la
+-
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf
+index 18eba5a..f5afe6f 100644
+--- a/src/plugins/bugzilla.conf
++++ b/src/plugins/bugzilla.conf
+@@ -1,5 +1,5 @@
+ # Bugzilla URL
+-BugzillaURL = https://bugzilla.redhat.com/
++BugzillaURL = https://bugs.gentoo.org/
+ # yes means that ssl certificates will be checked
+ SSLVerify = yes
+ # your login has to exist, if you don have any, please create one
+diff --git a/src/plugins/mailx_event.conf b/src/plugins/mailx_event.conf
+index a8c5d11..1c07a73 100644
+--- a/src/plugins/mailx_event.conf
++++ b/src/plugins/mailx_event.conf
+@@ -1,3 +1,3 @@
+-EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf
++# EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf
+ 
+ EVENT=report_Mailx      reporter-mailx
+diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf
+index f1a77f5..bb2e651 100644
+--- a/src/plugins/report_Bugzilla.conf
++++ b/src/plugins/report_Bugzilla.conf
+@@ -1,4 +1,4 @@
+-Bugzilla_BugzillaURL = https://bugzilla.redhat.com
++Bugzilla_BugzillaURL = https://bugs.gentoo.org/
+ Bugzilla_Login =
+ Bugzilla_Password =
+ Bugzilla_SSLVerify = yes
+diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
+index 8151d32..acaf7fb 100644
+--- a/src/plugins/report_Bugzilla.xml.in
++++ b/src/plugins/report_Bugzilla.xml.in
+@@ -16,8 +16,8 @@
+             <_label>Bugzilla URL</_label>
+             <allow-empty>no</allow-empty>
+             <_description>Address of Bugzilla server</_description>
+-            <default-value>https://bugzilla.redhat.com</default-value>
+-            <_note-html>You can create bugzilla.redhat.com account &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
++            <default-value>https://bugs.gentoo.org/</default-value>
++            <_note-html>You can create bugs.gentoo.org account &lt;a href="https://bugs.gentoo.org/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
+         </option>
+         <option type="text" name="Bugzilla_Login">
+             <_label>User name</_label>
+diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
+index a3e8855..17a686d 100644
+--- a/src/plugins/reporter-bugzilla.c
++++ b/src/plugins/reporter-bugzilla.c
+@@ -34,7 +34,7 @@ static void set_settings(struct bugzilla_struct *b, map_string_h *settings)
+     environ = getenv("Bugzilla_BugzillaURL");
+     b->b_bugzilla_url = environ ? environ : get_map_string_item_or_empty(settings, "BugzillaURL");
+     if (!b->b_bugzilla_url[0])
+-        b->b_bugzilla_url = "https://bugzilla.redhat.com";
++        b->b_bugzilla_url = "https://bugs.gentoo.org/";
+     b->b_bugzilla_xmlrpc = xasprintf("%s"XML_RPC_SUFFIX, b->b_bugzilla_url);
+ 
+     environ = getenv("Bugzilla_SSLVerify");
+diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py
+index 9c5e6b3..7188392 100644
+--- a/src/report-python/__init__.py
++++ b/src/report-python/__init__.py
+@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, NewtIO
+ 
+ import os
+ 
+-SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/redhat-release"]
+-SYSTEM_RELEASE_DEPS = ["system-release", "redhat-release"]
++SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/gentoo-release"]
++SYSTEM_RELEASE_DEPS = ["system-release", "gentoo-release"]
+ 
+ _hardcoded_default_product = ""
+ _hardcoded_default_version = ""
+-- 
+1.7.12
+
diff --git a/dev-libs/libreport/libreport-2.0.13.ebuild b/dev-libs/libreport/libreport-2.0.13.ebuild
new file mode 100644
index 000000000000..9f4e369e40db
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.0.13.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libreport/libreport-2.0.13.ebuild,v 1.1 2012/09/22 20:12:48 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+inherit autotools eutils python user
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://fedorahosted.org/abrt/"
+SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/btparser-0.18
+	>=dev-libs/glib-2.21:2
+	dev-libs/json-c
+	dev-libs/libtar
+	dev-libs/libxml2:2
+	dev-libs/newt
+	dev-libs/nss
+	dev-libs/xmlrpc-c
+	net-libs/libproxy
+	net-misc/curl[ssl]
+	sys-apps/dbus
+	>=x11-libs/gtk+-3.3.12:3
+	x11-misc/xdg-utils"
+RDEPEND="${COMMON_DEPEND}
+	|| ( gnome-base/gnome-keyring >=kde-base/kwalletd-4.8 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Replace redhat- and fedora-specific defaults with gentoo ones, and disable
+	# code that requires gentoo infra support.
+	epatch "${FILESDIR}/${PN}-2.0.13-gentoo.patch"
+
+	# Modify uploader_event so that the gui recognizes it
+	epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch"
+
+	# automake-1.12
+	epatch "${FILESDIR}/${PN}-2.0.13-automake-1.12.patch"
+
+	python_clean_py-compile_files
+
+	mkdir -p m4
+	eautoreconf
+}
+
+src_configure() {
+	ECONF="--disable-bodhi
+		--localstatedir=${EPREFIX}/var"
+	# --disable-debug enables debug!
+	use debug && ECONF="${ECONF} --enable-debug"
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
+
+pkg_postinst() {
+	python_mod_optimize report reportclient
+}
+
+pkg_postrm() {
+	python_mod_cleanup report reportclient
+}