- Update to 2.3.1

- Make the port look similar to net-p2p/amule-devel to ease updating the two.
- Partially pet portlint.

PR:		ports/162603
Submitted by:	Barbara (barbara.xxx1975 libero/it)
Approved by:	maintainer timeout (swell.k, 14 days)
Feature safe:	yes

2 files changed, 20 insertions, 16 deletions

diff --git a/net-p2p/amule/files/patch-src-ObservableQueue.h b/net-p2p/amule/files/patch-src-ObservableQueue.h
new file mode 100644
index 000000000000..3b5c60260627
--- /dev/null
+++ b/net-p2p/amule/files/patch-src-ObservableQueue.h
@@ -0,0 +1,20 @@
+--- src/ObservableQueue.h~
++++ src/ObservableQueue.h
+@@ -331,7 +331,7 @@ CObservableQueue<ValueType>::~CObservabl
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+@@ -338,7 +338,7 @@ void CObservableQueue<ValueType>::Observ
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
\ No newline at end of file
diff --git a/net-p2p/amule/files/patch-src-utils-wxCas-src-wxcasframe.cpp b/net-p2p/amule/files/patch-src-utils-wxCas-src-wxcasframe.cpp
deleted file mode 100644
index 74dd60dffd4d..000000000000
--- a/net-p2p/amule/files/patch-src-utils-wxCas-src-wxcasframe.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/utils/wxCas/src/wxcasframe.cpp~
-+++ src/utils/wxCas/src/wxcasframe.cpp
-@@ -285,11 +285,11 @@ WxCasFrame::GetStatImage () const
- #ifdef __WXMSW__
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
- #else
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
- #endif
- 
- 	memdc.